[Libreoffice-commits] core.git: sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Aug 13 12:57:38 UTC 2018


 sw/source/core/text/txtftn.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 06c680b8861e41bfa4ce95a69fa3feeb080bb350
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 13 12:29:57 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Aug 13 14:57:16 2018 +0200

    reuse of pCont implies its not supposed to be deleted in this scope
    
    Change-Id: I7c98c5e2a334966dc63a55fab96fa983ea542378
    Reviewed-on: https://gerrit.libreoffice.org/58926
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 78e30ed4f3e8..e07aac8691d9 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -689,6 +689,7 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea
                 // We have some room left, so the Footnote can grow
                 if ( pFootnoteFrame->GetFollow() && nDiff > 0 )
                 {
+                    SwFrameDeleteGuard aDeleteGuard(pCont);
                     SwTwips nHeight = aRectFnSet.GetHeight(pCont->getFrameArea());
                     pBoss->RearrangeFootnotes( nDeadLine, false, pFootnote );
                     ValidateBodyFrame();


More information about the Libreoffice-commits mailing list