sc/source/ui/cctrl/checklistmenu.cxx | 21 ++------------------- sc/source/ui/inc/checklistmenu.hxx | 1 - 2 files changed, 2 insertions(+), 20 deletions(-)
New commits: commit cbe0e221c54a4251c98a7f733c3f4b99de98c5e8 Author: Sahil Gautam <[email protected]> AuthorDate: Thu Dec 4 22:52:15 2025 +0530 Commit: Michael Stahl <[email protected]> CommitDate: Fri Dec 12 12:34:40 2025 +0100 Related tdf#167395: Remove unnecessary variable `mbChecked` `mbMarked` is enough to determine which autofilter entries are checked and should be locked when lock is toggled. Change-Id: I1c85e07d69340a131a9e3b7d31def29aa6c6daaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195063 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 4ea90e89422bd5dc5a31a986e8f6007c89df77da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195458 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index e571a570d7d8..9d3501080a9a 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -527,7 +527,6 @@ ScCheckListMember::ScCheckListMember() : mnValue(0.0) , mbVisible(true) , mbMarked(false) - , mbCheck(true) , mbHiddenByOtherFilter(false) , mbDate(false) , mbLeaf(false) @@ -855,14 +854,10 @@ namespace IMPL_LINK_NOARG(ScCheckListMenuControl, LockCheckedHdl, weld::Toggleable&, void) { - // assume all members are checked - for (auto& aMember : maMembers) - aMember.mbCheck = true; - bool bLockCheckedEntries = mxChkLockChecked->get_active(); // go over the members visible in the popup, and remember which one is - // checked, and which one is not + // checked, and which one is not by setting mbMarked to true; mpChecks->all_foreach([this](weld::TreeIter& rEntry){ if (mpChecks->get_toggle(rEntry) == TRISTATE_TRUE) { @@ -880,17 +875,6 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, LockCheckedHdl, weld::Toggleable&, void) } } } - else - { - for (auto& aMember : maMembers) - { - if (aMember.maName == mpChecks->get_text(rEntry)) - { - aMember.mbCheck = false; - break; - } - } - } return false; }); @@ -913,7 +897,7 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, LockCheckedHdl, weld::Toggleable&, void) // insert the members, remember whether checked or unchecked. mpChecks->bulk_insert_for_each(aShownIndexes.size(), [this, &aShownIndexes, &bLockCheckedEntries](weld::TreeIter& rIter, int i) { size_t nIndex = aShownIndexes[i]; - insertMember(*mpChecks, rIter, maMembers[nIndex], maMembers[nIndex].mbCheck, bLockCheckedEntries); + insertMember(*mpChecks, rIter, maMembers[nIndex], maMembers[nIndex].mbMarked, bLockCheckedEntries); }, nullptr, &aFixedWidths); } @@ -1262,7 +1246,6 @@ void ScCheckListMenuControl::addMember(const OUString& rName, const double nVal, aMember.mbValue = bValue; aMember.mbVisible = bVisible; aMember.mbMarked = false; - aMember.mbCheck = true; aMember.mbHiddenByOtherFilter = bHiddenByOtherFilter; aMember.mxParent.reset(); maMembers.emplace_back(std::move(aMember)); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 558ef9f47e37..5fd00b673b31 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -37,7 +37,6 @@ struct ScCheckListMember double mnValue; // number value of filter condition bool mbVisible; bool mbMarked; - bool mbCheck; bool mbHiddenByOtherFilter; bool mbDate; bool mbLeaf;
