The following commit has been merged in the master branch:
commit e49969b02f8a86ed8dd1bb8a3810d798ffd993be
Author: Bjoern Michaelsen <bjoern.michael...@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 166be9d..72b4e98 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,9 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
- stop building -gcj on all openjdk-archs, keep it on gcj-using archs
- build with gcc 4.6 again, add build-conflicts on g++ 4.6.1-10 and -11
+ * merge from ubuntu-oneiric-3.4:
+ - fixing crash on closing document with footnotes (LP: #854626)
+
-- Rene Engelhard <r...@debian.org> Mon, 26 Sep 2011 21:39:11 +0000
libreoffice (1:3.4.3-2) unstable; urgency=medium
diff --git a/patches/fdo39510.diff b/patches/fdo39510.diff
new file mode 100644
index 0000000..ecff07e
--- /dev/null
+++ b/patches/fdo39510.diff
@@ -0,0 +1,49 @@
+--- /dev/null 2011-09-27 10:43:04.452932903 +0200
++++ libreoffice/libreoffice-build/patches/hotfixes/fdo39510.diff
2011-09-27 17:03:55.218832472 +0200
+@@ -0,0 +1,46 @@
++From f8f5d96666bff5051cc88d06b10d855548a441de Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michael...@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 <m...@openoffice.org>
++---
++ sw/source/core/layout/newfrm.cxx | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++From 6a3faed5b459ea133c39ef5243dad8e366ca00c3 Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michael...@canonical.com>
++Date: Fri, 23 Sep 2011 01:13:34 +0200
++Subject: [PATCH 2/2] fdo#39510: comment added
++
++Signed-off-by: Michael Stahl <m...@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,6 +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 0642537..cc374c5 100644
--- a/patches/series
+++ b/patches/series
@@ -25,3 +25,4 @@ update-sdbc-postgresql.diff
handle-NULL-display-gracefully.diff
jdk-1.7.0-vendorname.diff
s390x.diff
+fdo39510.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1r8d5f-00067s...@vasks.debian.org
