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

[Caolán McNamara]

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

New commits:
commit 62f66fabadc80c5466aeedb61b373cf1dd5e4133
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 24 20:37:36 2015 +0000

    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 at googlemail.com>
    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 9fbcd2c..3db1622 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 );