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/inc/frame.hxx | 2 +- sw/source/core/inc/ftnfrm.hxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/source/core/inc') diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index e4c3ddb82d25..db8ca0732b40 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -704,7 +704,7 @@ public: bool IsProtected() const; bool IsColLocked() const { return mbColLocked; } - bool IsDeleteForbidden() const { return mbForbidDelete; } + virtual bool IsDeleteForbidden() const { return mbForbidDelete; } /// this is the only way to delete a SwFrame instance static void DestroyFrame(SwFrame *const pFrame); diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx index d9770da00662..c857a87daeda 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -73,6 +73,7 @@ protected: public: SwFootnoteFrame( SwFrameFormat*, SwFrame*, SwContentFrame*, SwTextFootnote* ); + virtual bool IsDeleteForbidden() const override; virtual void Cut() override; virtual void Paste( SwFrame* pParent, SwFrame* pSibling = nullptr ) override; -- cgit v1.2.3