summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-05 21:37:00 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-05 14:54:48 +0200
commit6165d24297dbae823057b0846d6a36af4f0a6794 (patch)
tree23d38bfd6342995ac6155631002646430739ccea
parent2796560f22d6e67f518b37078ca9cad5a019a998 (diff)
tdf#121005 forcepoint#44 merge into isDeleteForbidden
Reviewed-on: https://gerrit.libreoffice.org/55355 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9) Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32 Reviewed-on: https://gerrit.libreoffice.org/62629 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit ba4861a0dfdf97448925130995d69b4c516f0644)
-rw-r--r--sw/qa/core/data/ww8/fail/forcepoint-44.docbin0 -> 119808 bytes
-rw-r--r--sw/source/core/layout/pagechg.cxx2
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/core/data/ww8/fail/forcepoint-44.doc b/sw/qa/core/data/ww8/fail/forcepoint-44.doc
new file mode 100644
index 000000000000..100422a2249c
--- /dev/null
+++ b/sw/qa/core/data/ww8/fail/forcepoint-44.doc
Binary files differ
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index aac2ab98461d..9d346931ebfc 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1161,6 +1161,8 @@ namespace
{
bool isDeleteForbidden(const SwPageFrame *pDel)
{
+ if (pDel->IsDeleteForbidden())
+ return true;
const SwLayoutFrame* pBody = pDel->FindBodyCont();
const SwFrame* pBodyContent = pBody ? pBody->Lower() : nullptr;
return pBodyContent && pBodyContent->IsDeleteForbidden();