You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2014/07/23 21:09:26 UTC
svn commit: r1612925 -
/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
Author: nick
Date: Wed Jul 23 19:09:25 2014
New Revision: 1612925
URL: http://svn.apache.org/r1612925
Log:
Further XSSF external name evaluation lookup support
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java?rev=1612925&r1=1612924&r2=1612925&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java Wed Jul 23 19:09:25 2014
@@ -110,7 +110,9 @@ public final class XSSFEvaluationWorkboo
for (int i = 0; i < _uBook.getNumberOfNames(); i++) {
XSSFName nm = _uBook.getNameAt(i);
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);
}
}
@@ -138,10 +140,14 @@ public final class XSSFEvaluationWorkboo
for (org.apache.poi.ss.usermodel.Name name : linkTable.getDefinedNames()) {
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
// Should include the cached values, for in case that book isn't available
// 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 " +
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org