You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/06/10 07:41:09 UTC
svn commit: r1747657 [1/7] - in /poi/trunk: ./
src/java/org/apache/poi/hssf/model/ src/java/org/apache/poi/hssf/usermodel/
src/java/org/apache/poi/ss/formula/
src/java/org/apache/poi/ss/formula/functions/
src/java/org/apache/poi/ss/formula/ptg/ src/oox...
Author: onealj
Date: Fri Jun 10 07:41:09 2016
New Revision: 1747657
URL: http://svn.apache.org/viewvc?rev=1747657&view=rev
Log:
bug 57840: merge changes from ^/poi/branches/xssf_structured_references to ^/poi/trunk
Added:
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
- copied unchanged from r1747656, poi/branches/xssf_structured_references/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
Modified:
poi/trunk/ (props changed)
poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java
poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Indirect.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
poi/trunk/src/ooxml/testcases/org/apache/poi/ss/formula/TestFormulaParser.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
Propchange: poi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 07:41:09 2016
@@ -2,4 +2,5 @@
/poi/branches/excelant:1069732-1073692
/poi/branches/gsoc2012:1341450-1371650
/poi/branches/xml_signature:1617139-1628347
+/poi/branches/xssf_structured_references:1747607-1747656
/poi/trunk:693591-694881,695264-695420,695621,695649-711764
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java?rev=1747657&r1=1747656&r2=1747657&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java Fri Jun 10 07:41:09 2016
@@ -31,53 +31,53 @@ import org.apache.poi.ss.formula.Formula
*/
public final class HSSFFormulaParser {
- private static FormulaParsingWorkbook createParsingWorkbook(HSSFWorkbook book) {
- return HSSFEvaluationWorkbook.create(book);
- }
-
- private HSSFFormulaParser() {
- // no instances of this class
- }
-
- /**
- * Convenience method for parsing cell formulas. see {@link #parse(String, HSSFWorkbook, int, int)}
- */
- public static Ptg[] parse(String formula, HSSFWorkbook workbook) throws FormulaParseException {
- return parse(formula, workbook, FormulaType.CELL);
- }
-
- /**
- * @param formulaType a constant from {@link FormulaType}
- * @return the parsed formula tokens
+ private static FormulaParsingWorkbook createParsingWorkbook(HSSFWorkbook book) {
+ return HSSFEvaluationWorkbook.create(book);
+ }
+
+ private HSSFFormulaParser() {
+ // no instances of this class
+ }
+
+ /**
+ * Convenience method for parsing cell formulas. see {@link #parse(String, HSSFWorkbook, int, int)}
+ */
+ public static Ptg[] parse(String formula, HSSFWorkbook workbook) throws FormulaParseException {
+ return parse(formula, workbook, FormulaType.CELL);
+ }
+
+ /**
+ * @param formulaType a constant from {@link FormulaType}
+ * @return the parsed formula tokens
* @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
- */
- public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType) throws FormulaParseException {
- return parse(formula, workbook, formulaType, -1);
- }
-
- /**
- * @param formula the formula to parse
- * @param workbook the parent workbook
- * @param formulaType a constant from {@link FormulaType}
- * @param sheetIndex the 0-based index of the sheet this formula belongs to.
- * The sheet index is required to resolve sheet-level names. <code>-1</code> means that
- * the scope of the name will be ignored and the parser will match named ranges only by name
- *
- * @return the parsed formula tokens
+ */
+ public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType) throws FormulaParseException {
+ return parse(formula, workbook, formulaType, -1);
+ }
+
+ /**
+ * @param formula the formula to parse
+ * @param workbook the parent workbook
+ * @param formulaType a constant from {@link FormulaType}
+ * @param sheetIndex the 0-based index of the sheet this formula belongs to.
+ * The sheet index is required to resolve sheet-level names. <code>-1</code> means that
+ * the scope of the name will be ignored and the parser will match named ranges only by name
+ *
+ * @return the parsed formula tokens
* @throws FormulaParseException if the formula has incorrect syntax or is otherwise invalid
- */
- public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType, int sheetIndex) throws FormulaParseException {
- return FormulaParser.parse(formula, createParsingWorkbook(workbook), formulaType, sheetIndex);
- }
-
- /**
- * Static method to convert an array of {@link Ptg}s in RPN order
- * to a human readable string format in infix mode.
- * @param book used for defined names and 3D references
- * @param ptgs must not be <code>null</code>
- * @return a human readable String
- */
- public static String toFormulaString(HSSFWorkbook book, Ptg[] ptgs) {
- return FormulaRenderer.toFormulaString(HSSFEvaluationWorkbook.create(book), ptgs);
- }
+ */
+ public static Ptg[] parse(String formula, HSSFWorkbook workbook, int formulaType, int sheetIndex) throws FormulaParseException {
+ return FormulaParser.parse(formula, createParsingWorkbook(workbook), formulaType, sheetIndex);
+ }
+
+ /**
+ * Static method to convert an array of {@link Ptg}s in RPN order
+ * to a human readable string format in infix mode.
+ * @param book used for defined names and 3D references
+ * @param ptgs must not be <code>null</code>
+ * @return a human readable String
+ */
+ public static String toFormulaString(HSSFWorkbook book, Ptg[] ptgs) {
+ return FormulaRenderer.toFormulaString(HSSFEvaluationWorkbook.create(book), ptgs);
+ }
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java?rev=1747657&r1=1747656&r2=1747657&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java Fri Jun 10 07:41:09 2016
@@ -6,7 +6,7 @@
(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
+ 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,
@@ -38,6 +38,7 @@ import org.apache.poi.ss.formula.ptg.Nam
import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.ptg.Ref3DPtg;
import org.apache.poi.ss.formula.udf.UDFFinder;
+import org.apache.poi.ss.usermodel.Table;
import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.POILogFactory;
@@ -264,7 +265,16 @@ public final class HSSFEvaluationWorkboo
return extIx;
}
+ @Override
public SpreadsheetVersion getSpreadsheetVersion(){
return SpreadsheetVersion.EXCEL97;
}
+
+ /**
+ * @throws IllegalStateException: data tables are not supported in Excel 97-2003 format
+ */
+ @Override
+ public Table getTable(String name) {
+ throw new IllegalStateException("XSSF-style tables are not supported for HSSF");
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org