sw/source/core/layout/pagechg.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4535e2291741bb9262ca274cb50f80a2618cdcc2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 18 15:24:10 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 18 20:36:45 2020 +0100
crashtesting: export ooo88744-1.odt to .doc and load
intermittently on ctrl+end the layout crashes
Change-Id: I4b9b5ab8d1514a3847b4993afd6f4de414544d05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106059
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index f386afa1bdfd..a40b9d18bdcc 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1229,7 +1229,8 @@ void SwFrame::CheckPageDescs( SwPageFrame *pStart, bool
bNotifyFields, SwPageFra
#endif
}
assert(!bIsEmpty || !isPageFrameEmpty);
- if (bIsEmpty || isPageFrameEmpty)
+ const bool bWantRemovePage = bIsEmpty || isPageFrameEmpty;
+ if (bWantRemovePage && !pPage->IsDeleteForbidden())
{
// It also might be that an empty page is not needed at all.
// However, the algorithm above cannot determine that. It is not
needed if the following
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
