From 0005b330eaed0b5559042d2597fb45e0c9125d7e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 5 Dec 2018 13:22:44 +0000 Subject: forcepoint#76 avoid deleting footnote that would delete undeletable page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919 Reviewed-on: https://gerrit.libreoffice.org/64622 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- 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 1d3defae80da..920bd621fff4 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -856,7 +856,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 c0848948848f..b469e4169d78 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -80,6 +80,7 @@ class SwFootnoteFrame: public SwLayoutFrame 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