Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch from Johan from bug #54402 - fix IfError with indirect references 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1431403 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2013-01-10 15:08:22 +00:00
parent 008dea947c
commit f7b2d4047f
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/poi/ss/formula/atp/IfError.java
View File

@ -18,6 +18,7 @@
package org.apache.poi.ss.formula.atp; package org.apache.poi.ss.formula.atp;
import org.apache.poi.ss.formula.OperationEvaluationContext; import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.WorkbookEvaluator;
import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.eval.ValueEval;
@ -47,7 +48,7 @@ final class IfError implements FreeRefFunction {
ValueEval val; ValueEval val;
try { try {
val = evaluateArgParity(args[0], args[1], ec.getRowIndex(), ec.getColumnIndex()); val = evaluateInternal(args[0], args[1], ec.getRowIndex(), ec.getColumnIndex());
} catch (EvaluationException e) { } catch (EvaluationException e) {
return e.getErrorEval(); return e.getErrorEval();
} }
@ -55,7 +56,8 @@ final class IfError implements FreeRefFunction {
return val; return val;
} }
private static ValueEval evaluateArgParity(ValueEval arg, ValueEval iferror, int srcCellRow, int srcCellCol) throws EvaluationException { private static ValueEval evaluateInternal(ValueEval arg, ValueEval iferror, int srcCellRow, int srcCellCol) throws EvaluationException {
arg = WorkbookEvaluator.dereferenceResult(arg, srcCellRow, srcCellCol);
if(arg instanceof ErrorEval) { if(arg instanceof ErrorEval) {
return iferror; return iferror;
} else { } else {

11
src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
View File

@ -36,6 +36,7 @@ public class TestIfError extends TestCase {
/** /**
* =IFERROR(210/35,\"Error in calculation\")" Divides 210 by 35 and returns 6.0 * =IFERROR(210/35,\"Error in calculation\")" Divides 210 by 35 and returns 6.0
* =IFERROR(55/0,\"Error in calculation\")" Divides 55 by 0 and returns the error text * =IFERROR(55/0,\"Error in calculation\")" Divides 55 by 0 and returns the error text
* =IFERROR(C1,\"Error in calculation\")" References the result of dividing 55 by 0 and returns the error text
*/ */
public static void testEvaluate(){ public static void testEvaluate(){
Workbook wb = new HSSFWorkbook(); Workbook wb = new HSSFWorkbook();
@ -46,6 +47,7 @@ public class TestIfError extends TestCase {
// Create cells // Create cells
row1.createCell(0, Cell.CELL_TYPE_NUMERIC); row1.createCell(0, Cell.CELL_TYPE_NUMERIC);
row1.createCell(1, Cell.CELL_TYPE_NUMERIC); row1.createCell(1, Cell.CELL_TYPE_NUMERIC);
row1.createCell(2, Cell.CELL_TYPE_NUMERIC);
row2.createCell(0, Cell.CELL_TYPE_NUMERIC); row2.createCell(0, Cell.CELL_TYPE_NUMERIC);
row2.createCell(1, Cell.CELL_TYPE_NUMERIC); row2.createCell(1, Cell.CELL_TYPE_NUMERIC);
@ -54,17 +56,21 @@ public class TestIfError extends TestCase {
CellReference a2 = new CellReference("A2"); CellReference a2 = new CellReference("A2");
CellReference b1 = new CellReference("B1"); CellReference b1 = new CellReference("B1");
CellReference b2 = new CellReference("B2"); CellReference b2 = new CellReference("B2");
CellReference c1 = new CellReference("C1");
// Set values // Set values
sh.getRow(a1.getRow()).getCell(a1.getCol()).setCellValue(210); sh.getRow(a1.getRow()).getCell(a1.getCol()).setCellValue(210);
sh.getRow(a2.getRow()).getCell(a2.getCol()).setCellValue(55); sh.getRow(a2.getRow()).getCell(a2.getCol()).setCellValue(55);
sh.getRow(b1.getRow()).getCell(b1.getCol()).setCellValue(35); sh.getRow(b1.getRow()).getCell(b1.getCol()).setCellValue(35);
sh.getRow(b2.getRow()).getCell(b2.getCol()).setCellValue(0); sh.getRow(b2.getRow()).getCell(b2.getCol()).setCellValue(0);
sh.getRow(c1.getRow()).getCell(c1.getCol()).setCellFormula("A1/B2");
Cell cell1 = sh.createRow(3).createCell(0); Cell cell1 = sh.createRow(3).createCell(0);
cell1.setCellFormula("IFERROR(A1/B1,\"Error in calculation\")"); cell1.setCellFormula("IFERROR(A1/B1,\"Error in calculation\")");
Cell cell2 = sh.createRow(3).createCell(0); Cell cell2 = sh.createRow(3).createCell(0);
cell2.setCellFormula("IFERROR(A2/B2,\"Error in calculation\")"); cell2.setCellFormula("IFERROR(A2/B2,\"Error in calculation\")");
Cell cell3 = sh.createRow(3).createCell(0);
cell3.setCellFormula("IFERROR(C1,\"error\")");
double accuracy = 1E-9; double accuracy = 1E-9;
@ -80,5 +86,10 @@ public class TestIfError extends TestCase {
Cell.CELL_TYPE_STRING, evaluator.evaluate(cell2).getCellType()); Cell.CELL_TYPE_STRING, evaluator.evaluate(cell2).getCellType());
assertEquals("Rounds -10 to a nearest multiple of -3 (-9)", assertEquals("Rounds -10 to a nearest multiple of -3 (-9)",
"Error in calculation", evaluator.evaluate(cell2).getStringValue()); "Error in calculation", evaluator.evaluate(cell2).getStringValue());
assertEquals("Check that C1 returns string",
Cell.CELL_TYPE_STRING, evaluator.evaluate(cell3).getCellType());
assertEquals("Check that C1 returns string \"error\"",
"error", evaluator.evaluate(cell3).getStringValue());
} }
} }