moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Comments updates

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1612156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-07-20 19:13:45 +00:00
parent 05dc1ec70c
commit 146c39e070
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@
package org.apache.poi.xssf.usermodel; package org.apache.poi.xssf.usermodel;
import java.util.List;
import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationName; import org.apache.poi.ss.formula.EvaluationName;
@ -95,7 +97,13 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
} catch (NumberFormatException e) {} } catch (NumberFormatException e) {}
// Look up an External Link Table for this name // Look up an External Link Table for this name
throw new RuntimeException("Not implemented yet for book " + bookName); // TODO List<ExternalLinksTable> tables = _uBook.getExternalLinksTable();
for (int i=0; i<tables.size(); i++) {
if (tables.get(i).getLinkedFileName().equals(bookName)) {
return i;
}
}
throw new RuntimeException("Book not linked for filename " + bookName);
} }
public EvaluationName getName(String name, int sheetIndex) { public EvaluationName getName(String name, int sheetIndex) {
@ -127,7 +135,10 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
// External reference - reference is 1 based, link table is 0 based // External reference - reference is 1 based, link table is 0 based
int linkNumber = externalWorkbookNumber - 1; int linkNumber = externalWorkbookNumber - 1;
ExternalLinksTable linkTable = _uBook.getExternalLinksTable().get(linkNumber); ExternalLinksTable linkTable = _uBook.getExternalLinksTable().get(linkNumber);
return new ExternalName(nameName, -1, -1); // TODO Finish this // 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, -1);
} else { } else {
// Internal reference // Internal reference
int nameIdx = _uBook.getNameIndex(nameName); int nameIdx = _uBook.getNameIndex(nameName);

2
src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
View File

@ -1664,7 +1664,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
/** /**
* Formulas which reference named ranges, either in other * Formulas which reference named ranges, either in other
* sheets, or workbook scoped but in other workbooks. * sheets, or workbook scoped but in other workbooks.
* Currently failing with errors like * Used to fail with with errors like
* org.apache.poi.ss.formula.FormulaParseException: Cell reference expected after sheet name at index 9 * org.apache.poi.ss.formula.FormulaParseException: Cell reference expected after sheet name at index 9
* org.apache.poi.ss.formula.FormulaParseException: Parse error near char 0 '[' in specified formula '[0]!NR_Global_B2'. Expected number, string, or defined name * org.apache.poi.ss.formula.FormulaParseException: Parse error near char 0 '[' in specified formula '[0]!NR_Global_B2'. Expected number, string, or defined name
*/ */