From 33090865c494618f4e528bf5a10aae8c4fc443d1 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 31 Oct 2016 23:40:24 +0100 Subject: 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 --- sc/source/core/tool/interpr1.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sc') 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: -- cgit