Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further XSSF external name evaluation lookup support 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1612925 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-07-23 19:09:25 +00:00
parent e8794899b4
commit 48c0213a20
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
View File

@ -110,7 +110,9 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
for (int i = 0; i < _uBook.getNumberOfNames(); i++) { for (int i = 0; i < _uBook.getNumberOfNames(); i++) {
XSSFName nm = _uBook.getNameAt(i); XSSFName nm = _uBook.getNameAt(i);
String nameText = nm.getNameName(); String nameText = nm.getNameName();
if (name.equalsIgnoreCase(nameText) && nm.getSheetIndex() == sheetIndex) { int nameSheetindex = nm.getSheetIndex();
if (name.equalsIgnoreCase(nameText) &&
(nameSheetindex == -1 || nameSheetindex == sheetIndex)) {
return new Name(_uBook.getNameAt(i), i, this); return new Name(_uBook.getNameAt(i), i, this);
} }
} }
@ -138,10 +140,14 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
for (org.apache.poi.ss.usermodel.Name name : linkTable.getDefinedNames()) { for (org.apache.poi.ss.usermodel.Name name : linkTable.getDefinedNames()) {
if (name.getNameName().equals(nameName)) { if (name.getNameName().equals(nameName)) {
// HSSF returns one sheet higher than normal, and various bits
// of the code assume that. So, make us match that behaviour!
int nameSheetIndex = name.getSheetIndex() + 1;
// TODO Return a more specialised form of this, see bug #56752 // TODO Return a more specialised form of this, see bug #56752
// Should include the cached values, for in case that book isn't available // Should include the cached values, for in case that book isn't available
// Should support XSSF stuff lookups // Should support XSSF stuff lookups
return new ExternalName(nameName, -1, name.getSheetIndex()); return new ExternalName(nameName, -1, nameSheetIndex);
} }
} }
throw new IllegalArgumentException("Name '"+nameName+"' not found in " + throw new IllegalArgumentException("Name '"+nameName+"' not found in " +