diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-05 13:22:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-10 14:18:48 +0100 |
| commit | 0005b330eaed0b5559042d2597fb45e0c9125d7e (patch) | |
| tree | 7e60dddf005893fc61f26f8cb40afcf352004448 /sw/source/core/inc | |
| parent | d9dd06e7ce64d42a7df2c9e90061bb809f4fe7c6 (diff) | |
forcepoint#76 avoid deleting footnote that would delete undeletable page
Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919
Reviewed-on: https://gerrit.libreoffice.org/64622
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/inc')
| -rw-r--r-- | sw/source/core/inc/frame.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/ftnfrm.hxx | 1 |
2 files changed, 2 insertions, 1 deletions
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; |