sc/source/ui/cctrl/checklistmenu.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit ce5574f3ce66c1c393ec1533521e8f47d91a1008 Author: Sahil Gautam <[email protected]> AuthorDate: Thu Dec 4 14:28:29 2025 +0530 Commit: Michael Stahl <[email protected]> CommitDate: Fri Dec 12 12:33:26 2025 +0100 Related tdf#167395: Formatting change Change-Id: I77dd10f00c2a7d99034a97378b38379cf4eb4be5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195062 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 3a51cd8cb3cc40615c86d1a158c0135b4f27a3ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195457 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index d18191b58924..e571a570d7d8 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -809,7 +809,8 @@ IMPL_LINK(ScCheckListMenuControl, ButtonHdl, weld::Button&, rBtn, void) namespace { - void insertMember(weld::TreeView& rView, const weld::TreeIter& rIter, const ScCheckListMember& rMember, bool bChecked, bool bLock=false) + void insertMember(weld::TreeView& rView, const weld::TreeIter& rIter, + const ScCheckListMember& rMember, bool bChecked, bool bLock = false) { OUString aLabel = rMember.maName; if (aLabel.isEmpty()) commit a5e0f8a3df430b11b9ca9d729b7b000fbd103cac Author: Sahil Gautam <[email protected]> AuthorDate: Thu Dec 4 14:25:53 2025 +0530 Commit: Michael Stahl <[email protected]> CommitDate: Fri Dec 12 12:33:11 2025 +0100 Related tdf#167395: Use descriptive variable name for returned value Change-Id: Iac01f5632e1601aac63955db45b92e13cfca1e9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195061 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit b3fc9d9280076973bcc47c3fbb03fc179ec17e26) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195456 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9009af0a4fe4..d18191b58924 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -858,6 +858,8 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, LockCheckedHdl, weld::Toggleable&, void) 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 mpChecks->all_foreach([this](weld::TreeIter& rEntry){ @@ -908,14 +910,14 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, LockCheckedHdl, weld::Toggleable&, void) std::vector<int> aFixedWidths { mnCheckWidthReq }; // insert the members, remember whether checked or unchecked. - mpChecks->bulk_insert_for_each(aShownIndexes.size(), [this, &aShownIndexes](weld::TreeIter& rIter, int i) { + 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, mxChkLockChecked->get_active()); + insertMember(*mpChecks, rIter, maMembers[nIndex], maMembers[nIndex].mbCheck, bLockCheckedEntries); }, nullptr, &aFixedWidths); } // unmarking should happen after the members are inserted - if (!mxChkLockChecked->get_active()) + if (!bLockCheckedEntries) for (auto& aMember : maMembers) aMember.mbMarked = false; }
