diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2022-06-23 16:39:39 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2022-06-24 10:50:48 +0200 |
| commit | 1e169f781248c14110488eb064571068ad3d0f81 (patch) | |
| tree | 467a4a3bfc8df309acba3271865c37c65a96568e /sc | |
| parent | 2f5f43d2f4c337c51173ee665991671b0def5e1f (diff) | |
handle nullptr SharedString in ScQueryEvaluator (tdf#149679)
This may be the case if the string comes from ScMatrix::Get()
for ScMatValType::Empty.
Change-Id: I35013449611bf7ffd1bc74e023d76597af010724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136347
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 9e170a35eebbe86e6137510bc8ea34e5a45dbd8d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136332
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/queryevaluator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/core/data/queryevaluator.cxx b/sc/source/core/data/queryevaluator.cxx index 1e16398a4cfb..12e034da6fa0 100644 --- a/sc/source/core/data/queryevaluator.cxx +++ b/sc/source/core/data/queryevaluator.cxx @@ -481,8 +481,9 @@ std::pair<bool, bool> ScQueryEvaluator::compareByString(const ScQueryEntry& rEnt const rtl_uString* pQuer = rItem.maString.getDataIgnoreCase(); const rtl_uString* pCellStr = rSource.getDataIgnoreCase(); - assert(pQuer != nullptr); assert(pCellStr != nullptr); + if (pQuer == nullptr) + pQuer = svl::SharedString::getEmptyString().getDataIgnoreCase(); const sal_Int32 nIndex = (rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH) |