diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-05 13:22:44 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-15 17:47:07 +0100 |
| commit | 558f01a29cb640760e73724f6efdc0a1be20c8e3 (patch) | |
| tree | de495494c67be427c8ae8be41635eedbe7ae9bd8 /sw/source/core/inc | |
| parent | efe7b735104343e5e0182e1b004aca9c7b79a901 (diff) | |
tdf#119126 forcepoint#76 avoid deleting footnote that would delete ...
... 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í <xiscofauli@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.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 4f6375d664a9..ec78d7b40188 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -852,7 +852,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 7f964d654d4d..57ee6be5c7f9 100644 --- a/sw/source/core/inc/ftnfrm.hxx +++ b/sw/source/core/inc/ftnfrm.hxx @@ -70,6 +70,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; |