diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-06 21:04:23 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-02-12 21:06:50 +0100 |
| commit | 3f5d14710af646a8fd41a62a527992a2a231a4e2 (patch) | |
| tree | fba9f113eb91692fbee9ea66c857ea107248b088 | |
| parent | 41c72670fb16d4f051f3861415327cfe2156ad0d (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/+/146626
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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); |