[libreoffice] Resolves: rhbz#1179642 crash in GetFocus

[Caolán McNamara]

commit af3c31987b3440112d4755f96dddd62c3bd81911
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 24 21:02:48 2015 +0000

    Resolves: rhbz#1179642 crash in GetFocus

 ...bz-1179642-crash-in-GetFocus-with-empty-m.patch |   31 ++++++++++++++++++++
 libreoffice.spec                                   |    1 +
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch b/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
new file mode 100644
index 0000000..0d75ab7
--- /dev/null
+++ b/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
@@ -0,0 +1,31 @@
+From dae7d2089516d9cf014b9fad0adb484f19282a29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sat, 24 Jan 2015 20:59:27 +0000
+Subject: [PATCH] Resolves: rhbz#1179642 crash in GetFocus with empty
+ mpPreviouslyFocusedListBox
+
+Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
+---
+ 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 84b61d4..ff0c95e 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();
+     }
+ 
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 9d6b36e..f6512ba 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -329,6 +329,7 @@ Patch21: 0001-if-we-change-the-keys-we-have-to-resort-based-on-the.patch
 Patch22: 0001-rhbz-1175027-sw-fix-life-cycle-of-SwConnectionDispos.patch
 Patch23: 0001-rhbz-1184582-At-least-catch-and-log-UNO-exceptions-i.patch
 Patch24: 0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
+Patch25: 0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice