diff options
| author | Eike Rathke <erack@redhat.com> | 2016-10-31 23:40:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-03 21:30:13 +0000 |
| commit | bd47f43ce56639c891beda40d9070591b8df5ccf (patch) | |
| tree | 144628302866ce578ca3e89bf82beb055bbf0c9e | |
| parent | 806e323271982c8975ec2904219c6f136aa20eea (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.
(cherry picked from commit 33090865c494618f4e528bf5a10aae8c4fc443d1)
Conflicts:
sc/source/core/tool/interpr1.cxx
Change-Id: Ib33402e8c93f26cd8e2648426a5bde6b267c55ab
Reviewed-on: https://gerrit.libreoffice.org/30451
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index f540da98e883..8d7313d56a78 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -4814,7 +4814,7 @@ double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc ) case svExternalDoubleRef: { ScMatValType nType = GetDoubleOrStringFromMatrix( fVal, aString); - bIsString = ScMatrix::IsNonValueType( nType); + bIsString = ScMatrix::IsRealStringType( nType); } break; case svExternalSingleRef: @@ -5170,7 +5170,7 @@ void ScInterpreter::ScCountIf() case svExternalDoubleRef: { ScMatValType nType = GetDoubleOrStringFromMatrix(fVal, aString); - bIsString = ScMatrix::IsNonValueType( nType); + bIsString = ScMatrix::IsRealStringType( nType); } break; case svString: @@ -5391,7 +5391,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs eFunc ) case svExternalDoubleRef: { ScMatValType nType = GetDoubleOrStringFromMatrix( fVal, aString); - bIsString = ScMatrix::IsNonValueType( nType); + bIsString = ScMatrix::IsRealStringType( nType); } break; case svExternalSingleRef: |