diff options
| -rw-r--r-- | poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java | 3 | ||||
| -rw-r--r-- | test-data/spreadsheet/BooleanFunctionsTestCaseData.xls | bin | 30208 -> 30720 bytes | |||
| -rw-r--r-- | test-data/spreadsheet/LookupFunctionsTestCaseData.xls | bin | 70144 -> 70656 bytes |
3 files changed, 2 insertions, 1 deletions
diff --git a/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java index 1ef3f9c056..2f0611cfba 100644 --- a/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java +++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java @@ -18,6 +18,7 @@ package org.apache.poi.ss.formula.functions; import org.apache.poi.ss.formula.TwoDEval; +import org.apache.poi.ss.formula.eval.BlankEval; import org.apache.poi.ss.formula.eval.BoolEval; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.EvaluationException; @@ -91,7 +92,7 @@ public abstract class BooleanFunction implements Function,ArrayFunction { continue; } - if (arg == MissingArgEval.instance) { + if (arg == MissingArgEval.instance || arg == BlankEval.instance) { tempVe = false; // missing parameters are treated as FALSE } else { tempVe = OperandResolver.coerceValueToBoolean(arg, false); diff --git a/test-data/spreadsheet/BooleanFunctionsTestCaseData.xls b/test-data/spreadsheet/BooleanFunctionsTestCaseData.xls Binary files differindex 44808a5112..ded3ccf195 100644 --- a/test-data/spreadsheet/BooleanFunctionsTestCaseData.xls +++ b/test-data/spreadsheet/BooleanFunctionsTestCaseData.xls diff --git a/test-data/spreadsheet/LookupFunctionsTestCaseData.xls b/test-data/spreadsheet/LookupFunctionsTestCaseData.xls Binary files differindex d9e9b517d8..8ef287c8c1 100644 --- a/test-data/spreadsheet/LookupFunctionsTestCaseData.xls +++ b/test-data/spreadsheet/LookupFunctionsTestCaseData.xls |