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

Markus Mohrhard markus.mohrhard at googlemail.com
Sat Apr 30 15:29:53 UTC 2016


 sc/source/ui/cctrl/checklistmenu.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9f363ee99482c86140f8aa7e6503e316d6d085f2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Apr 30 18:25:04 2016 +0300

    ignore missing children, tdf#99422
    
    Change-Id: I2d4a7f03940045c34369876aea78c3eda81da78b

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index e8cb32d..1cfb393 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1138,6 +1138,7 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
     {
         aParents.insert(maMembers[i].mpParent);
     }
+
     for (auto itr = aParents.begin(), itrEnd = aParents.end(); itr != itrEnd; ++itr)
     {
         if (!(*itr))
@@ -1146,6 +1147,9 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
             for( sal_uInt16 i = 0; i < nCount; ++i)
             {
                 SvTreeListEntry* pEntry = maChecks->GetEntry(i);
+                if (!pEntry)
+                    continue;
+
                 maChecks->CheckEntry(pEntry, bSet);
             }
         }


More information about the Libreoffice-commits mailing list