[Libreoffice-commits] core.git: sc/source

Eike Rathke erack at redhat.com
Fri Sep 8 11:14:54 UTC 2017


 sc/source/ui/cctrl/checklistmenu.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd5ac4c4f5de9ef475156dafcba1b37a56b5cb8d
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Sep 8 13:13:54 2017 +0200

    If children then insert only if a child is selected, tdf#112258 follow-up
    
    Otherwise the chain down to the parent would be pickable, though in practice it
    doesn't have a consequence as only leaves are picked. However, inserting to the
    set can be avoided.
    
    Change-Id: I6a6b63b2d7c031a2dd13d8cc7d98f15e1f946298

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index e4f04da83504..74c5f6df301a 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1658,7 +1658,7 @@ void ScCheckListBox::GetRecursiveChecked( SvTreeListEntry* pEntry, std::unordere
         {
             OUString aLabel = rLabel;
             GetRecursiveChecked( rChild.get(), vOut, aLabel);
-            if (!aLabel.isEmpty())
+            if (!aLabel.isEmpty() && aLabel != rLabel)
                 vOut.insert( aLabel);
         }
         // Let the caller not add the parent alone.


More information about the Libreoffice-commits mailing list