[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.3-1-228-g76adda0
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 3c0bb7d5e8a8c5a502da7f6cd67d1a7716dcead8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Sep 27 17:27:15 2011 +0200
fixing crash on closing document with footnotes (LP: #854626)
diff --git a/changelog b/changelog
index 9333784..11abbab 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.4.3-1ubuntu4) UNRELEASED; urgency=low
+
+ * fixing crash on closing document with footnotes (LP: #854626)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 27 Sep 2011 17:25:21 +0200
+
libreoffice (1:3.4.3-1ubuntu3) oneiric; urgency=low
* merge from debian up to 7eed0868b20d50c83a59d41d79d6543500e3d63d
diff --git a/patches/fdo39510-1.diff b/patches/fdo39510-1.diff
new file mode 100644
index 0000000..c7dcdb3
--- /dev/null
+++ b/patches/fdo39510-1.diff
@@ -0,0 +1,29 @@
+--- /dev/null 2011-09-27 10:43:04.452932903 +0200
++++ libreoffice/libreoffice-build/patches/hotfixes/fdo39510-1.diff 2011-09-27 17:03:55.218832472 +0200
+@@ -0,0 +1,26 @@
++From f8f5d96666bff5051cc88d06b10d855548a441de Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Thu, 22 Sep 2011 18:47:21 +0200
++Subject: [PATCH 1/2] fdo#39510 lp#854626: crash on closing document with
++ footnotes
++
++Signed-off-by: Michael Stahl <mst@openoffice.org>
++---
++ sw/source/core/layout/newfrm.cxx | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
++index 86eefcb..7f19c1a 100644
++--- sw/source/core/layout/newfrm.cxx
+++++ sw/source/core/layout/newfrm.cxx
++@@ -607,6 +607,7 @@ SwRootFrm::~SwRootFrm()
++ {
++ bTurboAllowed = sal_False;
++ pTurbo = 0;
+++ AllRemoveFtns();
++ if(pBlink)
++ pBlink->FrmDelete( this );
++ if ( static_cast<SwFrmFmt*>(GetRegisteredInNonConst()) )
++--
++1.7.5.4
++
diff --git a/patches/fdo39510-2.diff b/patches/fdo39510-2.diff
new file mode 100644
index 0000000..29c8c2b
--- /dev/null
+++ b/patches/fdo39510-2.diff
@@ -0,0 +1,38 @@
+--- /dev/null 2011-09-27 10:43:04.452932903 +0200
++++ libreoffice/libreoffice-build/patches/hotfixes/fdo39510-2.diff 2011-09-27 17:03:55.218832472 +0200
+@@ -0,0 +1,35 @@
++From 6a3faed5b459ea133c39ef5243dad8e366ca00c3 Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Fri, 23 Sep 2011 01:13:34 +0200
++Subject: [PATCH 2/2] fdo#39510: comment added
++
++Signed-off-by: Michael Stahl <mst@openoffice.org>
++---
++ sw/source/core/layout/newfrm.cxx | 10 ++++++++++
++ 1 files changed, 10 insertions(+), 0 deletions(-)
++
++diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
++index 7f19c1a..3943336 100644
++--- sw/source/core/layout/newfrm.cxx
+++++ sw/source/core/layout/newfrm.cxx
++@@ -607,7 +607,17 @@ SwRootFrm::~SwRootFrm()
++ {
++ bTurboAllowed = sal_False;
++ pTurbo = 0;
+++ // fdo#39510 crash on document close with footnotes
+++ // Object ownership in writer and esp. in layout are a mess: Before the
+++ // document/layout split SwDoc and SwRootFrm were essentially one object
+++ // and magically/uncleanly worked around their common destruction by call
+++ // to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
+++ // the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
+++ // also searches backwards to find the master of footnotes, they must be
+++ // considered to be owned by the SwRootFrm and also be destroyed here,
+++ // before tearing down the (now footnote free) rest of the layout.
++ AllRemoveFtns();
+++
++ if(pBlink)
++ pBlink->FrmDelete( this );
++ if ( static_cast<SwFrmFmt*>(GetRegisteredInNonConst()) )
++--
++1.7.5.4
++
diff --git a/patches/series b/patches/series
index 9bcde62..5d6c676 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,5 @@ ubuntufixes-core.diff
ubuntufixes-binfilter.diff
fix-libreoffice-build-configure-in.diff
apply-ext-human-updates.diff
+fdo39510-1.diff
+fdo39510-2.diff
--
LibreOffice packaging repository
Reply to: