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

[Caolán McNamara]

 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2d2a5bf76d9bfa3bc2951d50e79fe79651569cbd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 24 20:59:27 2015 +0000

    Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBox
    
    Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
    (cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29)
    Reviewed-on: https://gerrit.libreoffice.org/14163
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index 3710e4c..34fd1f7 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -123,9 +123,10 @@ void ScPivotLayoutTreeListBase::GetFocus()
     if( GetGetFocusFlags() & GETFOCUS_MNEMONIC )
     {
         SvTreeListEntry* pEntry = mpParent->mpPreviouslyFocusedListBox->GetCurEntry();
-        InsertEntryForSourceTarget(pEntry, NULL);
+        if (pEntry)
+            InsertEntryForSourceTarget(pEntry, NULL);
 
-        if(mpParent->mpPreviouslyFocusedListBox != NULL)
+        if (mpParent->mpPreviouslyFocusedListBox != NULL)
             mpParent->mpPreviouslyFocusedListBox->GrabFocus();
     }