From 8d300dd55221f25c86ddca42beb234d495890c5f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 5 Dec 2018 13:22:44 +0000 Subject: tdf#119126 forcepoint#76 avoid deleting footnote that would delete ... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... undeletable page (cherry picked from commit 0005b330eaed0b5559042d2597fb45e0c9125d7e) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919 Reviewed-on: https://gerrit.libreoffice.org/66393 Tested-by: Xisco Faulí Reviewed-by: Miklos Vajna (cherry picked from commit 558f01a29cb640760e73724f6efdc0a1be20c8e3) --- sw/source/core/layout/calcmove.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'sw/source/core/layout/calcmove.cxx') diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 24484b3e8104..5179d4d2971a 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -245,6 +245,7 @@ void SwFrame::PrepareMake(vcl::RenderContext* pRenderContext) StackHack aHack; if ( GetUpper() ) { + SwFrameDeleteGuard aDeleteGuard(this); if ( lcl_IsCalcUpperAllowed( *this ) ) GetUpper()->Calc(pRenderContext); OSL_ENSURE( GetUpper(), ":-( Layout unstable (Upper gone)." ); -- cgit v1.2.3