diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-05 21:37:00 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-17 13:39:58 +0100 |
| commit | e8fad045ab0a48e853ab7a0047f2bf1f606c386d (patch) | |
| tree | 6bd9e024b034f9855ced7f2f0af6ce34bbda40a9 /sw | |
| parent | c0f4f85596b8821148a1709c74c6844645778df9 (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)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/data/ww8/fail/forcepoint-44.doc | bin | 0 -> 119808 bytes | |||
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 2 |
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 Binary files differnew file mode 100644 index 000000000000..100422a2249c --- /dev/null +++ b/sw/qa/core/data/ww8/fail/forcepoint-44.doc diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index b35a5e1e1e40..95bdb5137ade 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1217,6 +1217,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(); |