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

Fixed parsing formulas containing defined names beginning with an underscore, see Bug 9640

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@979329 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2010-07-26 15:52:57 +00:00
parent 8fab18e37a
commit de13c1193c
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<changes> <changes>
<release version="3.7-beta2" date="2010-??-??"> <release version="3.7-beta2" date="2010-??-??">
<action dev="POI-DEVELOPERS" type="add">49640 - Fixed parsing formulas containing defined names beginning with an underscore</action>
<action dev="POI-DEVELOPERS" type="add">49538 - Added implementation for POISSON()</action> <action dev="POI-DEVELOPERS" type="add">49538 - Added implementation for POISSON()</action>
<action dev="POI-DEVELOPERS" type="add">49524 - Support for setting cell text to be vertically rotated, via style.setRotation(0xff)</action> <action dev="POI-DEVELOPERS" type="add">49524 - Support for setting cell text to be vertically rotated, via style.setRotation(0xff)</action>
<action dev="POI-DEVELOPERS" type="fix">49609 - Case insensitive matching of OOXML part names</action> <action dev="POI-DEVELOPERS" type="fix">49609 - Case insensitive matching of OOXML part names</action>

4
src/java/org/apache/poi/ss/formula/FormulaParser.java
View File

@ -52,6 +52,7 @@ import org.apache.poi.ss.util.CellReference.NameType;
* @author Peter M. Murray (pete at quantrix dot com) * @author Peter M. Murray (pete at quantrix dot com)
* @author Pavel Krupets (pkrupets at palmtreebusiness dot com) * @author Pavel Krupets (pkrupets at palmtreebusiness dot com)
* @author Josh Micich * @author Josh Micich
* @author David Lewis (DLewis400 at gmail dot com)
*/ */
public final class FormulaParser { public final class FormulaParser {
private static final class Identifier { private static final class Identifier {
@ -537,7 +538,8 @@ public final class FormulaParser {
// which will either be named ranges or functions // which will either be named ranges or functions
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (!Character.isLetter(look)) { // defined names may begin with a letter or underscore
if (!Character.isLetter(look) && look != '_') {
throw expected("number, string, or defined name"); throw expected("number, string, or defined name");
} }
while (isValidDefinedNameChar(look)) { while (isValidDefinedNameChar(look)) {

23
src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
View File

@ -31,6 +31,9 @@ import org.apache.poi.hssf.record.formula.NamePtg;
import org.apache.poi.hssf.util.CellReference; import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.util.TempFile; import org.apache.poi.util.TempFile;
import org.apache.poi.ss.formula.FormulaType; import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Cell;
/** /**
* @author Andrew C. Oliver (acoliver at apache dot org) * @author Andrew C. Oliver (acoliver at apache dot org)
@ -935,4 +938,24 @@ public final class TestFormulas extends TestCase {
assertEquals(5.0, evaluator.evaluate(sh2.getRow(0).getCell(1)).getNumberValue(), 0.0); assertEquals(5.0, evaluator.evaluate(sh2.getRow(0).getCell(1)).getNumberValue(), 0.0);
assertEquals(15.0, evaluator.evaluate(sh2.getRow(0).getCell(2)).getNumberValue(), 0.0); assertEquals(15.0, evaluator.evaluate(sh2.getRow(0).getCell(2)).getNumberValue(), 0.0);
} }
/**
* Verify that FormulaParser handles defined names beginning with underscores,
* see Bug #49640
*/
public void testFormulasWithUnderscore(){
HSSFWorkbook wb = new HSSFWorkbook();
Name nm1 = wb.createName();
nm1.setNameName("_score1");
nm1.setRefersToFormula("A1");
Name nm2 = wb.createName();
nm2.setNameName("_score2");
nm2.setRefersToFormula("A2");
Sheet sheet = wb.createSheet();
Cell cell = sheet.createRow(0).createCell(2);
cell.setCellFormula("_score1*SUM(_score1+_score2)");
assertEquals("_score1*SUM(_score1+_score2)", cell.getCellFormula());
}
} }