Author: fanningpj
Date: Mon Nov 14 17:41:21 2022
New Revision: 1905308
URL: http://svn.apache.org/viewvc?rev=1905308&view=rev
Log:
[bug-66181] support VALUE function where input is a blank cell
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java?rev=1905308&r1=1905307&r2=1905308&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
Mon Nov 14 17:41:21 2022
@@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions;
+import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
@@ -53,6 +54,9 @@ public final class Value extends Fixed1A
return e.getErrorEval();
}
String strText = OperandResolver.coerceValueToString(veText);
+ if (veText == BlankEval.instance) {
+ return new NumberEval(0.0);
+ }
if (StringUtil.isBlank(strText)) {
return ErrorEval.VALUE_INVALID;
}
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java?rev=1905308&r1=1905307&r2=1905308&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
Mon Nov 14 17:41:21 2022
@@ -19,12 +19,20 @@ package org.apache.poi.ss.formula.functi
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.StringEval;
import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.util.Utils;
import org.junit.jupiter.api.Test;
+import java.io.IOException;
+
/**
* Tests for {@link Value}
*/
@@ -97,4 +105,17 @@ final class TestValue {
confirmValueError("1e2.5");
confirmValueError("");
}
+
+ @Test
+ void testBlank() throws IOException {
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFSheet sheet = wb.createSheet();
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell b1 = row.createCell(1);
+ HSSFCell c1 = row.createCell(2);
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ Utils.assertDouble(fe, b1, "VALUE(A1)", 0.0);
+ Utils.assertDouble(fe, c1, "VALUE(B1)", 0.0);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
