summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-24 20:37:36 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-01-25 10:18:20 +0000
commit62f66fabadc80c5466aeedb61b373cf1dd5e4133 (patch)
treeb96891a20adfaa69e31028916760715e92d5008b
parentd41349d8456361f8507f579d5bab388f56530b33 (diff)
Resolves: tdf#81124 crash on setting autofilter on column with no content
Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52 (cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a) Reviewed-on: https://gerrit.libreoffice.org/14158 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 9fbcd2c65e52..3db1622b91ef 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1066,6 +1066,8 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet)
{
setAllMemberState(!bSet);
SvTreeListEntry* pEntry = maChecks.GetCurEntry();
+ if (!pEntry)
+ return;
maChecks.CheckEntry(pEntry, bSet );
}
@@ -1461,7 +1463,6 @@ void ScCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( rKey.GetCode() == KEY_RETURN || rKey.GetCode() == KEY_SPACE )
{
SvTreeListEntry* pEntry = GetCurEntry();
-
if ( pEntry )
{
bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );