[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 c7dbb1ae155f0cd157a7407d6385b1d019c02c13
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jan 8 19:55:08 2013 +0100
lp#1097393: GetSdrPageView() might return NULL
diff --git a/changelog b/changelog
index 2cb3145..ca5a721 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ 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)
* backport crash when scrolling in multiselection in slide sorter (LP: #1097360)
* backport multi-threaded XIOError segv (LP: #1097370)
+ * backport GetSdrPageView() might return NULL (LP: #1097393)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff b/patches/lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
new file mode 100644
index 0000000..6f3c178
--- /dev/null
+++ b/patches/lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
@@ -0,0 +1,29 @@
+From d2d0fe29b7ed3c9f06f7ecc6f80a31556d1e2f31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 10 Sep 2012 22:55:02 +0100
+Subject: [PATCH] Resolves: rhbz#855972 crash on switching to outline view
+
+Change-Id: Ic2675e9d1d8ce6bb67e9c9e4db292f79c4240409
+---
+ svx/source/form/fmvwimp.cxx | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
+index ac668eb..e021cdf 100644
+--- a/svx/source/form/fmvwimp.cxx
++++ b/svx/source/form/fmvwimp.cxx
+@@ -931,8 +931,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
+ do
+ {
+
++ SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL;
++ SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL;
+ // get the forms collection of the page we belong to
+- FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL;
++ FmFormPage* pPage = PTR_CAST( FmFormPage, pSdrPage );
+ Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() );
+
+ const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 7d30db4..de2493e 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ improve-faux-bold-font.diff
lp-1097323-rhbz-806663-SlideshowImpl-can-outlive-SdMod.diff
lp-1097560-rhbz-842292-crash-in-calling-callback-whose.diff
lp-1097370-rhbz-855541-XIOError-handler-multithread-wo.diff
+lp-1097393-rhbz-855972-crash-on-switching-to-outline-v.diff
--
LibreOffice packaging repository
Reply to: