summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-24 20:37:36 +0000
committerAndras Timar <andras.timar@collabora.com>2015-02-06 13:13:31 +0100
commit39fc78ef1fbc85afba786f035108350266136abf (patch)
treec2280febc15841c51ab68c8b131cd43feb163bc2 /sc
parent5904e16762c68ef8f9e7e8e02dfa5e9d2a131e2b (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>
Diffstat (limited to 'sc')
-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 );