You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/05/23 10:55:23 UTC
svn commit: r1901162 - in /poi/trunk: poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
Author: fanningpj
Date: Mon May 23 10:55:22 2022
New Revision: 1901162
URL: http://svn.apache.org/viewvc?rev=1901162&view=rev
Log:
[bug-66022] issue in Formula Parser with some sheet names
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1901162&r1=1901161&r2=1901162&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java Mon May 23 10:55:22 2022
@@ -407,6 +407,7 @@ public final class TestXSSFFormulaParser
Sheet sheet1 = wb.createSheet("Sheet1");
Sheet sheet2 = wb.createSheet("Sheet2");
Sheet sheet3 = wb.createSheet("Sheet 3");
+ Sheet sheet4 = wb.createSheet("Sheet4>");
Row tempRow = sheet1.createRow(0);
tempRow.createCell(0).setCellValue(1);
@@ -420,6 +421,10 @@ public final class TestXSSFFormulaParser
tempRow.createCell(0).setCellValue(5);
tempRow.createCell(1).setCellValue(6);
+ tempRow = sheet4.createRow(0);
+ tempRow.createCell(0).setCellValue(5);
+ tempRow.createCell(1).setCellValue(6);
+
Cell cell = tempRow.createCell(2);
// unquoted sheet names
@@ -441,6 +446,20 @@ public final class TestXSSFFormulaParser
cell.setCellFormula(formula);
cellFormula = cell.getCellFormula();
assertEquals(formula, cellFormula);
+
+ // quoted sheet names with special character
+ cell = tempRow.createCell(5);
+ formula = "SUM('Sheet1:Sheet4>'!A1:B1)";
+ cell.setCellFormula(formula);
+ cellFormula = cell.getCellFormula();
+ assertEquals(formula, cellFormula);
+
+ // quoted sheet names with special character #2
+// cell = tempRow.createCell(6);
+// formula = "SUM('Sheet 3:Sheet4>'!A1:B1)";
+// cell.setCellFormula(formula);
+// cellFormula = cell.getCellFormula();
+// assertEquals(formula, cellFormula);
}
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java?rev=1901162&r1=1901161&r2=1901162&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java Mon May 23 10:55:22 2022
@@ -465,7 +465,7 @@ public final class FormulaParser {
private ParseNode parseRangeable() {
SkipWhite();
int savePointer = _pointer;
- SheetIdentifier sheetIden = parseSheetName();
+ SheetIdentifier sheetIden = parseSheetName(false);
if (sheetIden == null) {
resetPointer(savePointer);
@@ -1154,7 +1154,7 @@ public final class FormulaParser {
* Note - caller should reset {@link #_pointer} upon {@code null} result
* @return The sheet name as an identifier {@code null} if '!' is not found in the right place
*/
- private SheetIdentifier parseSheetName() {
+ private SheetIdentifier parseSheetName(boolean isSndPartOfQuotedRange) {
String bookName;
if (look == '[') {
bookName = getBookName();
@@ -1162,8 +1162,10 @@ public final class FormulaParser {
bookName = null;
}
- if (look == '\'') {
- Match('\'');
+ if (look == '\'' || isSndPartOfQuotedRange) {
+ if (!isSndPartOfQuotedRange) {
+ Match('\'');
+ }
if (look == '[')
bookName = getBookName();
@@ -1197,7 +1199,7 @@ public final class FormulaParser {
}
// See if it's a multi-sheet range, eg Sheet1:Sheet3!A1
if (look == ':') {
- return parseSheetRange(bookName, iden);
+ return parseSheetRange(bookName, iden, true);
}
return null;
}
@@ -1221,7 +1223,7 @@ public final class FormulaParser {
}
// See if it's a multi-sheet range, eg Sheet1:Sheet3!A1
if (look == ':') {
- return parseSheetRange(bookName, iden);
+ return parseSheetRange(bookName, iden, false);
}
return null;
}
@@ -1237,9 +1239,9 @@ public final class FormulaParser {
* If we have something that looks like [book]Sheet1: or
* Sheet1, see if it's actually a range eg Sheet1:Sheet2!
*/
- private SheetIdentifier parseSheetRange(String bookname, NameIdentifier sheet1Name) {
+ private SheetIdentifier parseSheetRange(String bookname, NameIdentifier sheet1Name, boolean isSndPartOfQuotedRange) {
GetChar();
- SheetIdentifier sheet2 = parseSheetName();
+ SheetIdentifier sheet2 = parseSheetName(isSndPartOfQuotedRange);
if (sheet2 != null) {
return new SheetRangeIdentifier(bookname, sheet1Name, sheet2.getSheetIdentifier());
}
Modified: poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java?rev=1901162&r1=1901161&r2=1901162&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java Mon May 23 10:55:22 2022
@@ -515,6 +515,7 @@ final class TestFormulaParser {
wb.createSheet("Cash_Flow");
wb.createSheet("Test Sheet");
+ wb.createSheet("Sheet 3>");
HSSFSheet sheet = wb.createSheet("Test");
HSSFRow row = sheet.createRow(0);
@@ -539,6 +540,10 @@ final class TestFormulaParser {
formula = cell.getCellFormula();
assertEquals("'Cash_Flow:Test Sheet'!A1", formula);
+ // special character
+ cell.setCellFormula("'Cash_Flow:Sheet 3>'!A1");
+ formula = cell.getCellFormula();
+ assertEquals("'Cash_Flow:Sheet 3>'!A1", formula);
// References to a range (area) of cells:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org