[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-3' - sc/source

[Libreoffice Gerrit user]

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

New commits:
commit ebf2c7c30423b5bba0a35e64e2e289820f2743a7
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Sun Oct 7 00:24:31 2018 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Oct 23 11:46:13 2018 +0200

    Resolves: tdf#73081 empty <> not-empty is also a match if numeric
    
    This simplifies to match empty for the same conditions whether
    numeric or not, an empty string does not result in numeric 0 here.
    
    Change-Id: I923a3e1f07dd2691d3ac720fc28ba76986fe6c3d
    Reviewed-on: https://gerrit.libreoffice.org/61486
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 9d8c89d9044edb5ad5c8bc4a8f0fd5868192714e)
    Reviewed-on: https://gerrit.libreoffice.org/61640
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 269eb700bb83..6e2fefa3f323 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -290,9 +290,9 @@ void ScQueryParamBase::FillInExcelSyntax(
          * This could be handled independently if all queries should support
          * it, needs to be evaluated if that actually is desired. */
 
-        // (empty = empty) is a match, and (empty <> not-empty) also is a match
-        if (rItem.meType == ScQueryEntry::ByString)
-            rItem.mbMatchEmpty = ((rEntry.eOp == SC_EQUAL && rItem.maString.isEmpty())
+        // (empty = empty) is a match, and (empty <> not-empty) also is a
+        // match. (empty = 0) is not a match.
+        rItem.mbMatchEmpty = ((rEntry.eOp == SC_EQUAL && rItem.maString.isEmpty())
                 || (rEntry.eOp == SC_NOT_EQUAL && !rItem.maString.isEmpty()));
     }
 }