diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2021-05-13 17:49:59 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-05-28 09:32:56 +0200 |
| commit | 00e13be1c3dd45597237f805a06b3e8a74187125 (patch) | |
| tree | 7532a8dedcb4cdb4b413037d878620977088ccd6 /sc/source | |
| parent | b24861a988fc2311cd873aa74d63afac9c5859ab (diff) | |
tdf#68113 sc autofilter: fix not empty button unchecks all entries
Instead unchecks all entries, unchecks only empty entries.
Change-Id: I6f0d6432151ad2c65871dc5f1dd206883994217a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115562
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 400a6a8184ce..635b13700b68 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -664,6 +664,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) ScQueryParam aParam; pDBData->GetQueryParam(aParam); + bool bQueryByNonEmpty = false; std::vector<ScQueryEntry*> aEntries = aParam.FindAllEntriesByField(nCol); std::unordered_set<OUString> aSelectedString; std::unordered_set<double> aSelectedValue; @@ -671,8 +672,13 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) { if (pEntry && pEntry->bDoQuery && pEntry->eOp == SC_EQUAL) { - ScQueryEntry::QueryItemsType& rItems = pEntry->GetQueryItems(); - std::for_each(rItems.begin(), rItems.end(), AddSelectedItemString(aSelectedString, aSelectedValue)); + if (!pEntry->IsQueryByNonEmpty()) + { + ScQueryEntry::QueryItemsType& rItems = pEntry->GetQueryItems(); + std::for_each(rItems.begin(), rItems.end(), AddSelectedItemString(aSelectedString, aSelectedValue)); + } + else + bQueryByNonEmpty = true; } } @@ -691,6 +697,8 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow) bSelected = aSelectedValue.count(aDoubleVal) > 0 || aSelectedString.count(aStringVal) > 0; } + else if (bQueryByNonEmpty) + bSelected = !aStringVal.isEmpty(); if ( rEntry.IsDate() ) rControl.addDateMember( aStringVal, rEntry.GetValue(), bSelected ); |