[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 560eb17d49039eb57f8c1f56a729a43174b59892
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 9 23:39:01 2013 +0100
lp#1097782: crash in SwXTextDocument::getRendererCount
diff --git a/changelog b/changelog
index c4d572c..67eb407 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport Load Java scripts with class loaders (LP: #1097744)
* backport Do not consider timestamp differences as corruption (LP: #1097748)
* backport sw: better fix for DOCX table import crash (LP: #1097760)
+ * backport crash in SwXTextDocument::getRendererCount (LP: #1097782)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097782-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.diff b/patches/lp-1097782-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.diff
new file mode 100644
index 0000000..37e519f
--- /dev/null
+++ b/patches/lp-1097782-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.diff
@@ -0,0 +1,33 @@
+From 7fa5a9222f52c5adccb23b93d9104c0d337c3016 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl@redhat.com>
+Date: Fri, 4 Jan 2013 22:27:22 +0100
+Subject: [PATCH 10/14] rhbz#890080: crash in
+ SwXTextDocument::getRendererCount
+
+No idea how to reproduce it; pSwView is checked before use except here.
+(possibly regression from 2f9f480b22f2fff59d9c48b4b46706c3d5223e66)
+
+Change-Id: Ia7667e879a6944e084a45c06133efc1ac2d8b3c0
+---
+ sw/source/ui/uno/unotxdoc.cxx | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
+index 8711d4e..8fb89db 100644
+--- a/sw/source/ui/uno/unotxdoc.cxx
++++ b/sw/source/ui/uno/unotxdoc.cxx
+@@ -2554,7 +2554,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
+ SwViewOption aOpt( *pViewShell->GetViewOptions() );
+ aOpt.setBrowseMode( false );
+ pViewShell->ApplyViewOptions( aOpt );
+- pSwView->RecheckBrowseMode();
++ if (pSwView)
++ {
++ pSwView->RecheckBrowseMode();
++ }
+ }
+
+ // reformating the document for printing will show the changes in the view
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 0561256..76d1a6e 100644
--- a/patches/series
+++ b/patches/series
@@ -51,3 +51,4 @@ lp-1097735-fdo-48442-fix-default-hori-vert-frame-anchor-during-.diff
lp-1097744-fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.diff
lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff
lp-1097760-rhbz-820283-fdo-55462-sw-better-fix-for-DOCX-table-i.diff
+lp-1097782-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.diff
--
LibreOffice packaging repository
Reply to: