From cb22ce4036c041e11865980089e47ede82468981 Mon Sep 17 00:00:00 2001 From: Avik Sengupta Date: Mon, 13 Oct 2003 16:45:01 +0000 Subject: [PATCH] Sheet naming checks caused a test failure in cloneSheet. CloneSheet used an invalid character, which we now dont allow! Corrected. Good thing we have tests!! git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/branches/REL_2_BRANCH@353393 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java | 6 +++++- .../org/apache/poi/hssf/usermodel/TestCloneSheet.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 058e60c7d3..c1bfbd3182 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -384,7 +384,11 @@ public class HSSFWorkbook windowTwo.setPaged(sheets.size() == 1); sheets.add(clonedSheet); - workbook.setSheetName(sheets.size()-1, srcName+"[1]"); + if (srcName.length()<28) { + workbook.setSheetName(sheets.size()-1, srcName+"(2)"); + }else { + workbook.setSheetName(sheets.size()-1,srcName.substring(0,28)+"(2)"); + } return clonedSheet; } return null; diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java index 052516108c..6ccf29ec27 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java @@ -79,7 +79,7 @@ public class TestCloneSheet extends TestCase { s.addMergedRegion(new Region((short)0,(short)0,(short)1,(short)1)); b.cloneSheet(0); } - catch(Exception e){fail(e.getMessage());} + catch(Exception e){e.printStackTrace();fail(e.getMessage());} } } -- 2.39.5