From 8580d5c1d3fb3537d6266a8f993dfa88ccddba4b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Jan 24 2015 21:01:26 +0000 Subject: Resolves: rhbz#1179642 crash in GetFocus --- 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?= +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 3c5f03a..a396358 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -373,6 +373,7 @@ Patch65: 0001-if-we-change-the-keys-we-have-to-resort-based-on-the.patch Patch66: 0001-font-cache-gets-broken-on-adding-an-embedded-font.patch Patch67: 0001-rhbz-1184582-At-least-catch-and-log-UNO-exceptions-i.patch Patch68: 0001-Resolves-fdo-88378-flipping-by-reversing-co-ord-syst.patch +Patch69: 0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2344,12 +2345,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog -* Thu Jan 22 2015 Caolán McNamara - 1:4.3.5.2-12-UNBUILT +* Sat Jan 24 2015 Caolán McNamara - 1:4.3.5.2-12-UNBUILT - Resolves: rhbz#1136013 ExternalToolEdit crash - font cache gets broken on adding an embedded font - if we change the keys we have to resort based on the new keys - Resolves: rhbz#1184582 crash in grammar checking thread - Resolves: fdo#88378 flipping by reversing coords no longer works +- Resolves: rhbz#1179642 crash in GetFocus * Fri Jan 16 2015 Eike Rathke - 1:4.3.5.2-11 - Resolves: rhbz#1171828 fdo#86978 append formula cells to track instead of tree