summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-10-31 23:40:24 +0100
committerEike Rathke <erack@redhat.com>2016-10-31 23:54:46 +0100
commit33090865c494618f4e528bf5a10aae8c4fc443d1 (patch)
tree80037fb95ea0c5383542795c56ccee02b4e4fe18
parentf25a15dc99b00dfd2def8bc4d6772b14a78a8a6c (diff)
Resolves: tdf#99291 empty array element should not match empty cell
As weird as it is, but an empty cell is only to be matched by an empty string, not another empty cell. Affects spreadsheet functions SUMIF, AVERAGEIF, COUNTIF, SUMIFS, AVERAGEIFS and COUNTIFS. Change-Id: Ib33402e8c93f26cd8e2648426a5bde6b267c55ab
-rw-r--r--sc/source/core/tool/interpr1.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 465b04b4365c..c3d5c55fa665 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4815,7 +4815,7 @@ double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc )
case svExternalDoubleRef:
{
ScMatValType nType = GetDoubleOrStringFromMatrix( fVal, aString);
- bIsString = ScMatrix::IsNonValueType( nType);
+ bIsString = ScMatrix::IsRealStringType( nType);
}
break;
case svExternalSingleRef:
@@ -5171,7 +5171,7 @@ void ScInterpreter::ScCountIf()
case svExternalDoubleRef:
{
ScMatValType nType = GetDoubleOrStringFromMatrix(fVal, aString);
- bIsString = ScMatrix::IsNonValueType( nType);
+ bIsString = ScMatrix::IsRealStringType( nType);
}
break;
case svString:
@@ -5374,7 +5374,7 @@ void ScInterpreter::IterateParametersIfs( sc::ParamIfsResult& rRes )
case svExternalDoubleRef:
{
ScMatValType nType = GetDoubleOrStringFromMatrix( fVal, aString);
- bIsString = ScMatrix::IsNonValueType( nType);
+ bIsString = ScMatrix::IsRealStringType( nType);
}
break;
case svExternalSingleRef: