[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bd47f43ce56639c891beda40d9070591b8df5ccf
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Oct 31 23:40:24 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f540da9..8d7313d 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: