From 9788ef65f0ad28affa41b12164331096305147ee Mon Sep 17 00:00:00 2001 From: Avik Sengupta Date: Thu, 21 Apr 2005 07:43:22 +0000 Subject: [PATCH] fix for not being able to name a sheet as Sheet1, with some tests git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353639 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java | 2 +- .../org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java | 8 +++++++- 2 files changed, 8 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 33e9e7622..8d6533252 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -365,7 +365,7 @@ public class HSSFWorkbook public HSSFSheet createSheet(String sheetname) { - if (workbook.doesContainsSheetName( sheetname, -1 )) + if (workbook.doesContainsSheetName( sheetname, sheets.size() )) throw new IllegalArgumentException( "The workbook already contains a sheet of this name" ); HSSFSheet sheet = new HSSFSheet(workbook); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java index 92ff4fce7..d07ed38b0 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java @@ -23,7 +23,7 @@ public class TestHSSFWorkbook extends TestCase throws Exception { HSSFWorkbook b = new HSSFWorkbook( ); - b.createSheet(); + b.createSheet("Sheet1"); b.createSheet(); b.createSheet("name1"); try @@ -56,6 +56,12 @@ public class TestHSSFWorkbook extends TestCase b.setSheetName( 3, "name2", HSSFWorkbook.ENCODING_UTF_16 ); b.setSheetName( 3, "name2", HSSFWorkbook.ENCODING_UTF_16 ); b.setSheetName( 3, "name2" ); + + HSSFWorkbook c = new HSSFWorkbook( ); + c.createSheet("Sheet1"); + c.createSheet("Sheet2"); + c.createSheet("Sheet3"); + c.createSheet("Sheet4"); } } \ No newline at end of file