diff options
| author | Eike Rathke <erack@redhat.com> | 2018-10-07 00:24:31 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-10-07 17:46:15 +0200 |
| commit | 9d8c89d9044edb5ad5c8bc4a8f0fd5868192714e (patch) | |
| tree | b0b449e9066e9ca24f1399c60512facd4e583d73 | |
| parent | 86d9e48fc60dd7325658feca7088100c78023a7b (diff) | |
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@redhat.com>
Tested-by: Jenkins
| -rw-r--r-- | sc/source/core/tool/queryparam.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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())); } } |