| commit | 59d37768321e2975efa2c8be5513d178de899eba | [log] |
|---|---|---|
| author | Caolán McNamara <caolanm@redhat.com> | Mon Feb 06 21:04:23 2023 +0000 |
| committer | Michael Stahl <michael.stahl@allotropia.de> | Thu Feb 09 10:59:17 2023 +0000 |
| tree | 062a696e07ab19d5b5db47ffc53efcda32208e1a | |
| parent | f9229fdadbd205a8953577efc72a6e43717c764e [diff] |
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 <caolanm@redhat.com> (cherry picked from commit df2ad816288a4729c9cea8d14b7d590ac271d18b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146627 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index db4c4f9..652436e 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);