| 1 |
tv |
812201 |
From dae7d2089516d9cf014b9fad0adb484f19282a29 Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
|
|
Date: Sat, 24 Jan 2015 20:59:27 +0000 |
| 4 |
|
|
Subject: [PATCH] Resolves: rhbz#1179642 crash in GetFocus with empty |
| 5 |
|
|
mpPreviouslyFocusedListBox |
| 6 |
|
|
|
| 7 |
|
|
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76 |
| 8 |
|
|
--- |
| 9 |
|
|
sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 5 +++-- |
| 10 |
|
|
1 file changed, 3 insertions(+), 2 deletions(-) |
| 11 |
|
|
|
| 12 |
|
|
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |
| 13 |
|
|
index 84b61d4..ff0c95e 100644 |
| 14 |
|
|
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |
| 15 |
|
|
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx |
| 16 |
|
|
@@ -123,9 +123,10 @@ void ScPivotLayoutTreeListBase::GetFocus() |
| 17 |
|
|
if( GetGetFocusFlags() & GETFOCUS_MNEMONIC ) |
| 18 |
|
|
{ |
| 19 |
|
|
SvTreeListEntry* pEntry = mpParent->mpPreviouslyFocusedListBox->GetCurEntry(); |
| 20 |
|
|
- InsertEntryForSourceTarget(pEntry, NULL); |
| 21 |
|
|
+ if (pEntry) |
| 22 |
|
|
+ InsertEntryForSourceTarget(pEntry, NULL); |
| 23 |
|
|
|
| 24 |
|
|
- if(mpParent->mpPreviouslyFocusedListBox != NULL) |
| 25 |
|
|
+ if (mpParent->mpPreviouslyFocusedListBox != NULL) |
| 26 |
|
|
mpParent->mpPreviouslyFocusedListBox->GrabFocus(); |
| 27 |
|
|
} |
| 28 |
|
|
|
| 29 |
|
|
-- |
| 30 |
|
|
1.9.3 |
| 31 |
|
|
|
Parent Directory
| 
Revision Log