diff --git a/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch b/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch new file mode 100644 index 0000000..4780c83 --- /dev/null +++ b/0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch @@ -0,0 +1,40 @@ +From 4128c63d655869e0ab7befde2c46761d8e1b273f Mon Sep 17 00:00:00 2001 +From: Thorsten Behrens +Date: Thu, 10 Apr 2014 19:40:54 +0200 +Subject: [PATCH] Fix fdo#71423 - crash while editing Impress tables. + +Band-aid fix for this nasty crasher, seems sometimes the +family item is not found. + +Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06 +(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b) +Signed-off-by: Andras Timar +--- + sfx2/source/dialog/templdlg.cxx | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx +index ecc4d41..cbd856f 100644 +--- a/sfx2/source/dialog/templdlg.cxx ++++ b/sfx2/source/dialog/templdlg.cxx +@@ -1245,6 +1245,8 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() + if(pStyleSheetPool && nActFamily != 0xffff) + { + const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); ++ if(!pItem) ++ return; + pStyleSheetPool->SetSearchMask(pItem->GetFamily(), SFXSTYLEBIT_ALL_VISIBLE); + StyleTreeArr_Impl aArr; + SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); +@@ -1589,7 +1591,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() + // other filters for automatic + CheckItem( nActFamily, sal_True ); + const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl(); +- if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags ++ if ( pStyleItem && 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags + && nAppFilter != pItem->GetValue()) + { + nAppFilter = pItem->GetValue(); +-- +1.9.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 03319c7..cb3ee91 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 5%{?libo_prerelease}%{?dist} +Release: 6%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -283,6 +283,7 @@ Patch46: 0001-fdo-76663-Let-s-not-skip-the-first-element-of-a-matr.patch Patch47: 0001-various-situations-where-graphic-go-missing-on-save.patch Patch48: 0001-resolved-fdo-70455-B1-SOMENAME-is-not-a-valid-single.patch Patch49: 0001-rhbz-1105376-move-FlatODF-filter-config-to-right-pla.patch +Patch50: 0001-Fix-fdo-71423-crash-while-editing-Impress-tables.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2160,6 +2161,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Wed Jun 11 2014 Caolán McNamara - 1:4.1.6.2-6 +- Resolves: rhbz#1107340 crash in styles and formatting in impress + * Mon Jun 09 2014 David Tardon - 1:4.1.6.2-5 - Resolves: rhbz#1105376 FlatODF import/export does not work unless libreoffice-xsltfilter is installed