summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-16 11:54:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-08-16 12:12:15 +0100
commitb101ff56e874824fa9f0d37a8468b07dbf3d002c (patch)
treefb7fcc6dd56cc89c0f751c4f57c57ea877521439
parenta5d144933088502bb79c99e0cd5808f4a18a4f76 (diff)
Resolves: tdf#101165 crash on deselecting all filters
this affects 5-1, but not master because of 7967e5e51e5210b8c3d3dc63502bd7d875eb36b7 which changed the trigger in ScCheckListMenuWindow::setAllMemberState but lets fix it in master anyway in case there's another route in here Change-Id: I49162bb73bf6dbef5cff68d35d10da2c47d9f2b5
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 93f9aef01da0..a017cdaf2e39 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1714,8 +1714,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 );