[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

Caolán McNamara caolanm at redhat.com
Thu Aug 18 16:07:09 UTC 2016


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

New commits:
commit ecef794528282fa7e9fba93b6eff1dac097dae99
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 16 11:54:38 2016 +0100

    Resolves: tdf#101165 crash on deselecting all filters
    
    (cherry picked from commit b101ff56e874824fa9f0d37a8468b07dbf3d002c)
    
    Change-Id: I49162bb73bf6dbef5cff68d35d10da2c47d9f2b5
    Reviewed-on: https://gerrit.libreoffice.org/28165
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index e5897ec..9d3298e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1632,8 +1632,11 @@ SvTreeListEntry* ScCheckListBox::ShowCheckEntry( const OUString& sName, ScCheckL
     {
         if ( !pEntry )
         {
-            if ( rMember.mbDate )
+            if (rMember.mbDate)
             {
+                if (rMember.maDateParts.empty())
+                    return nullptr;
+
                 SvTreeListEntry* pYearEntry = FindEntry( nullptr, rMember.maDateParts[0] );
                 if ( !pYearEntry )
                     pYearEntry = InsertEntry( rMember.maDateParts[0], nullptr, true );


More information about the Libreoffice-commits mailing list