[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 2a7fcb540a26d5125a776ede3b60020d9c95e09d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jan 8 17:11:22 2013 +0100
lp#1097323: SdModule::GetSdOptions: signal 11 (SIGSEGV)
diff --git a/changelog b/changelog
index debc1d2..d94aa5b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
+
+ * backport SdModule::GetSdOptions: Process /usr/lib64/libreoffice/program/soffice.bin was killed by signal 11 (SIGSEGV) (LP: #1097323)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
+
libreoffice (1:3.5.7-0ubuntu2) precise-proposed; urgency=low
[Nobuto MURATA]
diff --git a/patches/lp-1097323-rhbz-806663-SlideshowImpl-can-outlive-SdMod.diff b/patches/lp-1097323-rhbz-806663-SlideshowImpl-can-outlive-SdMod.diff
new file mode 100644
index 0000000..1bbc0fc
--- /dev/null
+++ b/patches/lp-1097323-rhbz-806663-SlideshowImpl-can-outlive-SdMod.diff
@@ -0,0 +1,29 @@
+From 6e898a3fee75761f33758df725bcf5679359e11e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 26 Mar 2012 13:53:55 +0100
+Subject: [PATCH] Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
+ (somehow)
+
+---
+ sd/source/ui/slideshow/slideshowimpl.cxx | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
+index 32d8e71..b44627e 100644
+--- a/sd/source/ui/slideshow/slideshowimpl.cxx
++++ b/sd/source/ui/slideshow/slideshowimpl.cxx
+@@ -595,7 +595,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.10.4
+
diff --git a/patches/series b/patches/series
index b7eceb7..eaee00c 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ lp-973134-default-to-Documents-for-saving-look-for-t.diff
lp-527938-triple-paperbag-fix-service-name-again.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
improve-faux-bold-font.diff
+lp-1097323-rhbz-806663-SlideshowImpl-can-outlive-SdMod.diff
--
LibreOffice packaging repository
Reply to: