diff --git a/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch b/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch new file mode 100644 index 0000000..e59bc2f --- /dev/null +++ b/0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch @@ -0,0 +1,27 @@ +From 3090cfc972287da3fbdc567387527b65b3bfd128 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 1 Jul 2013 12:56:17 +0100 +Subject: [PATCH] Resolves: rhbz#979758 crash on 'Diagrammen in LibreOffice' + help page + +Change-Id: I269846840b8e2f67838da525c020a305901cf903 +--- + sw/source/core/unocore/unocrsrhelper.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx +index deeb5ba..66202c0 100644 +--- a/sw/source/core/unocore/unocrsrhelper.cxx ++++ b/sw/source/core/unocore/unocrsrhelper.cxx +@@ -176,7 +176,7 @@ void GetSelectableFromAny(uno::Reference const& xIfc, + if (pRanges) + { + SwUnoCrsr const* pUnoCrsr = pRanges->GetCursor(); +- if (pUnoCrsr->GetDoc() == &rTargetDoc) ++ if (pUnoCrsr && pUnoCrsr->GetDoc() == &rTargetDoc) + { + o_rpPaM = lcl_createPamCopy(*pUnoCrsr); + } +-- +1.8.2.1 + diff --git a/libreoffice.spec b/libreoffice.spec index c7eba1b..9cd2ffc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 7%{?libo_prerelease}%{?dist} +Release: 8%{?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/ @@ -251,6 +251,7 @@ Patch20: 0001-buildfix.patch Patch21: 0001-fix-rtf-import-on-big-endian.patch Patch22: 0001-Resolves-rhbz-976304-gallery-elements-may-not-suppor.patch Patch23: 0001-convert-the-right-number-of-elements.patch +Patch24: 0001-Resolves-rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1001,6 +1002,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch21 -p1 -b .fix-rtf-import-on-big-endian.patch %patch22 -p1 -b .rhbz-976304-gallery-elements-may-not-suppor.patch %patch23 -p1 -b .convert-the-right-number-of-elements.patch +%patch24 -p1 -b .rhbz-979758-crash-on-Diagrammen-in-LibreOff.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2075,6 +2077,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jul 01 2013 Caolán McNamara - 1:4.1.0.1-8 +- Resolves: rhbz#979758 crash on Diagrammen in LibreOffice help page + * Thu Jun 27 2013 David Tardon - 1:4.1.0.1-7 - bump revision