summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-24 20:59:27 +0000
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-02-03 12:22:22 +0100
commit86ea9493fda77e6aa5e6ebd666b2d8306057d6cc (patch)
tree52878cf6a4f353831f0dcafdff05a2d41c9e0f3e
parent48cdb25686e0db390c910622d729590a19213a5d (diff)
Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBox
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76 (cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29) Reviewed-on: https://gerrit.libreoffice.org/14161 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index f4201dc01d5a..9dd08ce58286 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -122,9 +122,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();
}