[libreoffice/f16] Resolves: rhbz#806663 SlideshowImpl can outlive SdModule

[Caolán McNamara]

commit 369f559c84e7423bd6b335b9e7b328d893bb0856
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 26 14:20:36 2012 +0100

    Resolves: rhbz#806663 SlideshowImpl can outlive SdModule

 ...bz-806663-SlideshowImpl-can-outlive-SdMod.patch |   26 ++++++++++++++++++++
 libreoffice.spec                                   |   12 ++++----
 2 files changed, 32 insertions(+), 6 deletions(-)
---
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?= <caolanm at redhat.com>
+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 2ab1a7e..4cc9887 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -241,8 +241,8 @@ Patch119: 0001-Disable-problematic-reading-of-external-entities-in-.patch
 Patch120: 0001-Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch
 Patch121: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
 Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
-Patch123: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
-Patch124: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
+Patch123: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
+Patch124: 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}
@@ -1168,8 +1168,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch120 -p1 -b .Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch
 %patch121 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
 %patch122 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch
-%patch123 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
-%patch124 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
+%patch123 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
+%patch124 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2489,9 +2489,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Tue Mar 14 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-9.UNBUILT
-- Resolves: rhbz#770209 can't change paper tray setting while printing
+* Mon Mar 26 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-9.UNBUILT
 - Resolves: rhbz#789022 SwNodes: fix inconsistent outline check
+- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
 
 * Tue Mar 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8
 - Resolves: fdo#31966 do not create an empty slide when printing handouts