forcepoint#39 bad layout

reproducible with ./instdir/program/soffice.bin --headless --convert-to pdf sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc

Change-Id: I93bd8a75196ddb2a1a242752bb1e06164bf7148e
Reviewed-on: https://gerrit.libreoffice.org/53002
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 2a957e408530cd16526d793c87f0e6fd4bed1548)

3 files changed, 3 insertions, 0 deletions

diff --git a/sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc b/sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc
new file mode 100755
index 000000000000..37801a9b14e2
--- /dev/null
+++ b/sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 523e1a1e7133..5f60078f6203 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1449,6 +1449,7 @@ void CalcContent( SwLayoutFrame *pLay, bool bNoColl )
             }
 
             {
+                SwFrameDeleteGuard aDeletePageGuard(pSect->FindPageFrame());
                 SwFrameDeleteGuard aDeleteGuard(pSect);
                 pFrame->Calc(pRenderContext);
             }
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index bafe1a96d7d1..674282280c19 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1212,6 +1212,8 @@ namespace
              !pSibling->FindFirstBodyContent() &&
              (!pRefPage || !isDeleteForbidden(pSibling)) )
         {
+            if (pSibling->IsDeleteForbidden())
+                throw uno::RuntimeException("bad layout");
             pRoot->RemovePage( pRefSibling, SwRemoveResult::Next ) ;
             return false;
         }