pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 63984: AND / OR should treat missing parameters as FALSE

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1872125 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2019-12-30 19:57:11 +00:00
parent 71338b958c
commit bc0dcdf369
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
View File

@ -55,7 +55,7 @@ public abstract class BooleanFunction implements Function,ArrayFunction {
private boolean calculate(ValueEval[] args) throws EvaluationException {
boolean result = getInitialResultValue();
boolean atleastOneNonBlank = false;
boolean atLeastOneNonBlank = false;
/*
* Note: no short-circuit boolean loop exit because any ErrorEvals will override the result
@ -71,8 +71,8 @@ public abstract class BooleanFunction implements Function,ArrayFunction {
ValueEval ve = ae.getValue(rrIx, rcIx);
tempVe = OperandResolver.coerceValueToBoolean(ve, true);
if (tempVe != null) {
result = partialEvaluate(result, tempVe.booleanValue());
atleastOneNonBlank = true;
result = partialEvaluate(result, tempVe);
atLeastOneNonBlank = true;
}
}
}
@ -86,26 +86,26 @@ public abstract class BooleanFunction implements Function,ArrayFunction {
ValueEval ve = re.getInnerValueEval(sIx);
tempVe = OperandResolver.coerceValueToBoolean(ve, true);
if (tempVe != null) {
result = partialEvaluate(result, tempVe.booleanValue());
atleastOneNonBlank = true;
result = partialEvaluate(result, tempVe);
atLeastOneNonBlank = true;
}
}
continue;
}
if (arg == MissingArgEval.instance) {
tempVe = null; // you can leave out parameters, they are simply ignored
tempVe = false; // missing parameters are treated as FALSE
} else {
tempVe = OperandResolver.coerceValueToBoolean(arg, false);
}
if (tempVe != null) {
result = partialEvaluate(result, tempVe.booleanValue());
atleastOneNonBlank = true;
result = partialEvaluate(result, tempVe);
atLeastOneNonBlank = true;
}
}
if (!atleastOneNonBlank) {
if (!atLeastOneNonBlank) {
throw new EvaluationException(ErrorEval.VALUE_INVALID);
}
return result;
@ -161,7 +161,7 @@ public abstract class BooleanFunction implements Function,ArrayFunction {
try {
ValueEval ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex);
Boolean b = OperandResolver.coerceValueToBoolean(ve, false);
boolArgVal = b == null ? false : b.booleanValue();
boolArgVal = b == null ? false : b;
} catch (EvaluationException e) {
return e.getErrorEval();
}

BIN
test-data/spreadsheet/BooleanFunctionsTestCaseData.xls
View File

Binary file not shown.