diff --git a/0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch b/0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch new file mode 100644 index 0000000..f92356e --- /dev/null +++ b/0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch @@ -0,0 +1,34 @@ +From 7d53f81f0a88afcff0f60bbd066a5645ac2e6a8b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 14 Mar 2014 15:30:31 +0000 +Subject: [PATCH] Related: rhbz#1075951 abrt crash in + MSWordExportBase::OutputFormat + +Change-Id: I681fa40196eb04f4824e49458cba0acc15b26193 +--- + sw/source/filter/ww8/ww8atr.cxx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx +index 7eb3134..da25acc 100644 +--- a/sw/source/filter/ww8/ww8atr.cxx ++++ b/sw/source/filter/ww8/ww8atr.cxx +@@ -745,10 +745,13 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF + case RES_TXTFMTCOLL: + if( bPapFmt ) + { ++ int nLvl = MAXLEVEL; ++ + if (((const SwTxtFmtColl&)rFmt).IsAssignedToListLevelOfOutlineStyle()) +- { +- int nLvl = ((const SwTxtFmtColl&)rFmt).GetAssignedOutlineStyleLevel(); ++ nLvl = ((const SwTxtFmtColl&)rFmt).GetAssignedOutlineStyleLevel(); + ++ if (nLvl >= 0 && nLvl < MAXLEVEL) ++ { + //if outline numbered + // if Write StyleDefinition then write the OutlineRule + const SwNumFmt& rNFmt = pDoc->GetOutlineNumRule()->Get( static_cast( nLvl ) ); +-- +1.8.5.3 + diff --git a/libreoffice.spec b/libreoffice.spec index b324c35..b6481af 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?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/ @@ -287,6 +287,7 @@ Patch24: 0001-Resolves-rhbz-1077780-crash-on-loading-.docx.patch Patch25: 0001-Change-SDK-javaodc-from-static-Package-to-dynamic-Ge.patch Patch26: 0001-Package-GeneratedPackage-fixup.patch Patch27: 0001-rhbz-1080196-Delete-the-destination-first-then-paste.patch +Patch28: 0001-Related-rhbz-1075951-abrt-crash-in-MSWordExportBase-.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -2176,6 +2177,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Tue Apr 01 2014 Caolán McNamara - 1:4.2.3.2-3 +- Related: rhbz#1075951 abrt crash in MSWordExportBase + * Mon Mar 31 2014 David Tardon - 1:4.2.3.2-2 - Resolves: rhbz#1080196 mdds/multi_type_vector_itr.hpp update_node(): soffice.bin killed by SIGSEGV