[Libreoffice-commits] .: sw/source

[Bjoern Michaelsen]

 sw/source/core/layout/newfrm.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 1b37830b605972649fe54c29fbb952df0e4c9682
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Sep 23 01:13:34 2011 +0200

    fdo#39510: comment added

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 924bdb3..4504e6e 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -603,7 +603,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()) )