summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-05 13:22:44 +0000
committerAndras Timar <andras.timar@collabora.com>2021-05-10 16:33:50 +0200
commit8d300dd55221f25c86ddca42beb234d495890c5f (patch)
tree50097ae68fc60a54c42d8925d65cc38e20df6d91 /sw/source/core/inc
parentd114007a25b4ccd590818cfe8fefd91ddfeb7969 (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> (cherry picked from commit 558f01a29cb640760e73724f6efdc0a1be20c8e3)
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/frame.hxx2
-rw-r--r--sw/source/core/inc/ftnfrm.hxx1
2 files changed, 2 insertions, 1 deletions
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;