From 143cab518a1d8509d63dce39a26a87d4ae2be018 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Mon, 13 Dec 2010 05:39:39 +0000 Subject: [PATCH] Fix bug #50440 - Support evaluating formulas with newlines in them, which XSSF may have (but HSSF may not) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1045021 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../usermodel/XSSFEvaluationWorkbook.java | 16 +++++++++++++++- .../poi/xssf/usermodel/TestXSSFBugs.java | 18 ++++++++++++++++++ test-data/spreadsheet/NewlineInFormulas.xlsx | Bin 0 -> 8703 bytes 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 test-data/spreadsheet/NewlineInFormulas.xlsx diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 946e24ea7e..05d4d10bd1 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 50440 - Support evaluating formulas with newlines in them, which XSSF may have (but HSSF may not) Added inline string support to XSSF EventModel 50246 - Properly position GutsRecord when reading HSSF workbooks 48539 - Added implementation for MROUND(), VAR() and VARP() 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 9535504506..e5bec593ba 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java @@ -147,12 +147,26 @@ public final class XSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E public Ptg[] getFormulaTokens(EvaluationCell evalCell) { XSSFCell cell = ((XSSFEvaluationCell)evalCell).getXSSFCell(); XSSFEvaluationWorkbook frBook = XSSFEvaluationWorkbook.create(_uBook); - return FormulaParser.parse(cell.getCellFormula(), frBook, FormulaType.CELL, _uBook.getSheetIndex(cell.getSheet())); + String formulaText = cleanXSSFFormulaText(cell.getCellFormula()); + return FormulaParser.parse(formulaText, frBook, FormulaType.CELL, _uBook.getSheetIndex(cell.getSheet())); } public UDFFinder getUDFFinder(){ return _uBook.getUDFFinder(); } + + /** + * XSSF allows certain extra textual characters in the formula that + * HSSF does not. As these can't be composed down to HSSF-compatible + * Ptgs, this method strips them out for us. + */ + private String cleanXSSFFormulaText(String text) { + // Newlines are allowed in XSSF + text = text.replaceAll("\\n", "").replaceAll("\\r", ""); + + // All done with cleaning + return text; + } private static final class Name implements EvaluationName { 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 3d9d69297e..b45a5df6c8 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -602,4 +602,22 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { } } } + + /** + * Newlines are valid characters in a formula + */ + public void test50440() throws Exception { + Workbook wb = XSSFTestDataSamples.openSampleWorkbook("NewlineInFormulas.xlsx"); + Sheet s = wb.getSheetAt(0); + Cell c = s.getRow(0).getCell(0); + + assertEquals("SUM(\n1,2\n)", c.getCellFormula()); + assertEquals(3.0, c.getNumericCellValue()); + + FormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator(); + formulaEvaluator.evaluateFormulaCell(c); + + assertEquals("SUM(\n1,2\n)", c.getCellFormula()); + assertEquals(3.0, c.getNumericCellValue()); + } } diff --git a/test-data/spreadsheet/NewlineInFormulas.xlsx b/test-data/spreadsheet/NewlineInFormulas.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..6a3ac949e9f0416d9986f3e0a5c5c18fb13ada42 GIT binary patch literal 8703 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 T^fCYd5Bb4DI_f97AHV(wL6f4j literal 0 HcmV?d00001 -- 2.39.5