summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-05 21:37:00 +0100
committerAndras Timar <andras.timar@collabora.com>2021-05-10 16:33:50 +0200
commita37bd33953d2354462bab7d4c8f4142a027d10ac (patch)
tree07b8b987e135f66fdd5a2b1ad6f4136b581083d7
parentc9758e9e8771e5574b4d1e907092eecf3e005e01 (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.cxx4
2 files changed, 2 insertions, 2 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 53afdb0425d1..14407d2b75c3 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1186,6 +1186,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();
@@ -1213,8 +1215,6 @@ namespace
!pSibling->FindFirstBodyContent() &&
(!pRefPage || !isDeleteForbidden(pSibling)) )
{
- if (pSibling->IsDeleteForbidden())
- throw uno::RuntimeException("bad layout");
pRoot->RemovePage( pRefSibling, SwRemoveResult::Next ) ;
return false;
}