[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/ftnfrm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 51512d7bce52002ca29c0e6c5264ac34166ede85
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 6 21:04:23 2023 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Feb 9 10:59:11 2023 +0000

    Related: tdf#153319 don't destroy frame with IsDeleteForbidden set
    
    not sufficient on its own to fix this crash.
    
    Change-Id: Ibd8b68d7e007d8a22770b3d73f0d17a1869cf279
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146598
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit df2ad816288a4729c9cea8d14b7d590ac271d18b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146626
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 9cc83c1bfc18..6fb88185a6f2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2420,7 +2420,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const 
SwTwips nDeadLine, const boo
     if ( !bLock && bUnlockLastFootnoteFrame &&
          !pLastFootnoteFrame->GetLower() &&
          !pLastFootnoteFrame->IsColLocked() &&
-         !pLastFootnoteFrame->IsBackMoveLocked() )
+         !pLastFootnoteFrame->IsBackMoveLocked() &&
+         !pLastFootnoteFrame->IsDeleteForbidden() )
     {
         pLastFootnoteFrame->Cut();
         SwFrame::DestroyFrame(pLastFootnoteFrame);