Fix bug #45430 - Correct named range sheet reporting when no local sheet id is given in the xml

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@677979 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 73 insertions, 3 deletions

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
index 5392bfce8d..fd5f544b18 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
@@ -57,10 +57,21 @@ public class XSSFName implements Name {
 	}
 	
 	public String getSheetName() {
-		long sheetId = ctName.getLocalSheetId();
-		if(sheetId >= 0) {
-			return workbook.getSheetName((int)sheetId);
+		if(ctName.isSetLocalSheetId()) {
+			// Given as explicit sheet id
+			long sheetId = ctName.getLocalSheetId();
+			if(sheetId >= 0) {
+				return workbook.getSheetName((int)sheetId);
+			}
+		} else {
+			// Is it embeded in the reference itself?
+			int excl = getReference().indexOf('!');
+			if(excl > -1) {
+				return getReference().substring(0, excl);
+			}
 		}
+		
+		// Not given at all
 		return null;
 	}
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
index b68104a867..9509d787ca 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/AllXSSFUsermodelTests.java
@@ -36,6 +36,7 @@ public final class AllXSSFUsermodelTests {
 	public static Test suite() {
 		TestSuite result = new TestSuite(AllXSSFUsermodelTests.class.getName());
 		result.addTestSuite(TestXSSFBorder.class);
+		result.addTestSuite(TestXSSFBugs.class);
 		result.addTestSuite(TestXSSFCellFill.class);
 		result.addTestSuite(TestXSSFHeaderFooter.class);
 		result.addTestSuite(TestXSSFSheetComments.class);
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
new file mode 100644
index 0000000000..e3d6745734
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -0,0 +1,58 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xssf.usermodel;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class TestXSSFBugs extends TestCase {
+	private String getFilePath(String file) {
+		File xml = new File(
+				System.getProperty("HSSF.testdata.path") +
+				File.separator + file
+		);
+		assertTrue(xml.exists());
+		
+		return xml.toString();
+	}
+	
+	/**
+	 * Named ranges had the right reference, but
+	 *  the wrong sheet name
+	 */
+	public void test45430() throws Exception {
+		XSSFWorkbook wb = new XSSFWorkbook(getFilePath("45430.xlsx"));
+		assertEquals(3, wb.getNumberOfNames());
+		
+		assertEquals(0, wb.getNameAt(0).getCTName().getLocalSheetId());
+		assertFalse(wb.getNameAt(0).getCTName().isSetLocalSheetId());
+		assertEquals("SheetA!$A$1", wb.getNameAt(0).getReference());
+		assertEquals("SheetA", wb.getNameAt(0).getSheetName());
+		
+		assertEquals(0, wb.getNameAt(1).getCTName().getLocalSheetId());
+		assertFalse(wb.getNameAt(1).getCTName().isSetLocalSheetId());
+		assertEquals("SheetB!$A$1", wb.getNameAt(1).getReference());
+		assertEquals("SheetB", wb.getNameAt(1).getSheetName());
+		
+		assertEquals(0, wb.getNameAt(2).getCTName().getLocalSheetId());
+		assertFalse(wb.getNameAt(2).getCTName().isSetLocalSheetId());
+		assertEquals("SheetC!$A$1", wb.getNameAt(2).getReference());
+		assertEquals("SheetC", wb.getNameAt(2).getSheetName());
+	}
+}