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:53 +0000
commite56e924d2d7b683049d2c6820e92ef14933a75ef (patch)
tree28850f054780989787511aa11d1214ecd10b09d4
parentdb4be3fee9369d8a0bb2df07c25564f19eb564ed (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/14159 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 1b05eff304be..51166aa9965f 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1091,6 +1091,8 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet)
{
setAllMemberState(!bSet);
SvTreeListEntry* pEntry = maChecks.GetCurEntry();
+ if (!pEntry)
+ return;
maChecks.CheckEntry(pEntry, bSet );
}
@@ -1486,7 +1488,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 );