Comments updates

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

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
index 9728e73ab4d98d92cb2122aa3585ce50c3f2d3a0..fd5bb0366d95f1cf2d8ea914b7c3b2779e2552c4 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
@@ -17,6 +17,8 @@
 
 package org.apache.poi.xssf.usermodel;
 
+import java.util.List;
+
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.formula.EvaluationCell;
 import org.apache.poi.ss.formula.EvaluationName;
@@ -95,7 +97,13 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
         } catch (NumberFormatException e) {}
 
         // 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) {
@@ -127,7 +135,10 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E
             // External reference - reference is 1 based, link table is 0 based
             int linkNumber = externalWorkbookNumber - 1;
             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 {
             // Internal reference
             int nameIdx = _uBook.getNameIndex(nameName);

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 7f64b192b6de5f0bee40e6a5f93a449485f8724c..696e32c53c5ab06d2d256b868a6eb2d5e613604f 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -1664,7 +1664,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
     /**
      * Formulas which reference named ranges, either in other
      *  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: Parse error near char 0 '[' in specified formula '[0]!NR_Global_B2'. Expected number, string, or defined name 
      */