From 36079acc525142932e6dc5f73d9b3858c2092b8f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 24 Jan 2015 20:59:27 +0000 Subject: 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 Reviewed-by: Markus Mohrhard --- sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 84b61d466996..ff0c95ea771c 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(); } -- cgit v1.2.3