Author: fanningpj
Date: Fri Feb 25 19:18:37 2022
New Revision: 1898425
URL: http://svn.apache.org/viewvc?rev=1898425&view=rev
Log:
[bug-65915] possible issue in boolean function support
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java?rev=1898425&r1=1898424&r2=1898425&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
Fri Feb 25 19:18:37 2022
@@ -139,14 +139,7 @@ public abstract class BooleanFunction im
@Override
public ValueEval evaluateArray(ValueEval[] args, int srcRowIndex, int
srcColumnIndex) {
- if (args.length == 1) {
- return evaluateOneArrayArg(args[0], srcRowIndex, srcColumnIndex,
- vA -> evaluate(new ValueEval[]{vA}, srcRowIndex,
srcColumnIndex));
- } else if (args.length == 2) {
- return evaluateTwoArrayArgs(args[0], args[1], srcRowIndex,
srcColumnIndex,
- (vA, vB) -> evaluate(new ValueEval[]{vA, vB}, srcRowIndex,
srcColumnIndex));
- }
- return ErrorEval.VALUE_INVALID;
+ return evaluate(args, srcRowIndex, srcColumnIndex);
}
private static ValueEval evaluateFalse(ValueEval[] args, int srcRowIndex,
int srcColumnIndex) {
Modified:
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java?rev=1898425&r1=1898424&r2=1898425&view=diff
==============================================================================
---
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
(original)
+++
poi/trunk/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOrFunction.java
Fri Feb 25 19:18:37 2022
@@ -98,7 +98,21 @@ final class TestOrFunction {
HSSFSheet sheet = wb.createSheet();
HSSFRow row = sheet.createRow(0);
HSSFCell cell = row.createCell(0);
- sheet.setArrayFormula("INDEX({1},1,IF(OR(FALSE,FALSE),1,1))", new
CellRangeAddress(0, 0, 0, 0));
+ sheet.setArrayFormula("INDEX({1},1,IF(OR(FALSE,FALSE),0,1))", new
CellRangeAddress(0, 0, 0, 0));
+ fe.evaluateAll();
+ assertEquals(1.0, cell.getNumericCellValue());
+ }
+ }
+
+ @Test
+ void testBug65915Array3Function() throws IOException {
+ //https://bz.apache.org/bugzilla/show_bug.cgi?id=65915
+ try (HSSFWorkbook wb = new HSSFWorkbook()) {
+ HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+ HSSFSheet sheet = wb.createSheet();
+ HSSFRow row = sheet.createRow(0);
+ HSSFCell cell = row.createCell(0);
+ sheet.setArrayFormula("INDEX({1},1,IF(OR(1=2,2=3,3=4),0,1))", new
CellRangeAddress(0, 0, 0, 0));
fe.evaluateAll();
assertEquals(1.0, cell.getNumericCellValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
