[Libreoffice-commits] core.git: sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/ww8/fail/forcepoint-44.doc |binary
 sw/source/core/layout/pagechg.cxx          |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 5 21:37:00 2018 +0100

    forcepoint#44 merge into isDeleteForbidden
    
    Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32
    Reviewed-on: https://gerrit.libreoffice.org/55355
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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
Binary files /dev/null and b/sw/qa/core/data/ww8/fail/forcepoint-44.doc differ
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index d31162d79aa3..ee41a0d4f77b 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1237,6 +1237,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();
@@ -1264,8 +1266,6 @@ namespace
              !pSibling->FindFirstBodyContent() &&
              (!pRefPage || !isDeleteForbidden(pSibling)) )
         {
-            if (pSibling->IsDeleteForbidden())
-                throw uno::RuntimeException("bad layout");
             pRoot->RemovePage( pRefSibling, SwRemoveResult::Next ) ;
             return false;
         }