diff --git a/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch b/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch new file mode 100644 index 0000000..436ae97 --- /dev/null +++ b/0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch @@ -0,0 +1,26 @@ +From 24b867c1e1d2264ff138d4eafa9791fcd1191160 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 26 Mar 2012 13:53:55 +0100 +Subject: [PATCH] Resolves: rhbz#806663 SlideshowImpl can outlive SdModule + (somehow) + + +diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx +index 3bc8dc1..ed9d76d 100644 +--- a/sd/source/ui/slideshow/slideshowimpl.cxx ++++ b/sd/source/ui/slideshow/slideshowimpl.cxx +@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, + + SlideshowImpl::~SlideshowImpl() + { +- SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); ++ SdModule *pModule = SD_MOD(); ++ //rhbz#806663 SlideshowImpl can outlive SdModule ++ SdOptions* pOptions = pModule ? ++ pModule->GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL; + if( pOptions ) + { + pOptions->SetPresentationPenColor(mnUserPaintColor); +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 41be1ce..8c29a0e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 1%{?dist} +Release: 2%{?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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -139,6 +139,7 @@ Patch22: 0001-silence-SolarMutex-not-locked-spew.patch Patch23: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +Patch27: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -986,6 +987,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch23 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch %patch24 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch %patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch +%patch27 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2273,6 +2275,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Mar 26 2012 Caolán McNamara - 3.5.2.1-2 +- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule + * Sun Mar 25 2012 David Tardon - 3.5.2.1-1 - 3.5.2 rc1 -drop integrated 0001-yet-another-clash-with-macro-name.patch