summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-24 20:59:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-24 20:59:27 +0000
commitdae7d2089516d9cf014b9fad0adb484f19282a29 (patch)
tree0cba07e12cfc2f174d8b55badee9488cec72128e
parent034e0a5967a459469eb99fc5dc2f47a2d298d266 (diff)
Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBox
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
-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 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();
}