diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-02 20:16:37 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-03-03 08:54:41 +0100 |
| commit | ac605821ecf3ea263d4812ebec352314a2dbff42 (patch) | |
| tree | ab553a455acc301c27e39dbe7b6f0c35efb49f33 | |
| parent | c35a59ae2e26ee30b036d3946a9be26e981838b7 (diff) | |
add a SwFrameDeleteGuard to SwSaveFootnoteHeight
Change-Id: Ic4f0bb7c26cc021119b09682075a05d5207b48a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130897
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | sw/source/core/inc/ftnboss.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx index 3ee7859bf8f3..e60ff97de1a9 100644 --- a/sw/source/core/inc/ftnboss.hxx +++ b/sw/source/core/inc/ftnboss.hxx @@ -31,6 +31,7 @@ class SwTextFootnote; // Restoration of the old value in DTor. Implementation in ftnfrm.cxx class SwSaveFootnoteHeight { + SwFrameDeleteGuard aGuard; SwFootnoteBossFrame *pBoss; const SwTwips nOldHeight; SwTwips nNewHeight; diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index a01c0c8bc4f0..2b0b5458c383 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2866,6 +2866,7 @@ bool SwContentFrame::MoveFootnoteCntFwd( bool bMakePage, SwFootnoteBossFrame *pO } SwSaveFootnoteHeight::SwSaveFootnoteHeight( SwFootnoteBossFrame *pBs, const SwTwips nDeadLine ) : + aGuard(pBs), pBoss( pBs ), nOldHeight( pBs->GetMaxFootnoteHeight() ) { |