sw/source/core/layout/calcmove.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 07642832e3d9c3d1648324ef40bff09bfde1f6e5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 21 15:55:46 2019 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Thu May 23 14:56:38 2019 +0200
crashtesting: failure on layout of tdf92372-4.odt
Change-Id: I8d5bb318674311b1e21c6fdf487d69609af344a5
Reviewed-on: https://gerrit.libreoffice.org/72725
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 1cdf8705d1d1..b7b083ee88d4 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1263,7 +1263,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext*
/*pRenderContext*/)
}
if ( GetUpper()->IsSctFrame() &&
- HasFollow() &&
+ HasFollow() && !GetFollow()->IsDeleteForbidden() &&
&GetFollow()->GetFrame() == GetNext() )
{
dynamic_cast<SwTextFrame&>(*this).JoinFrame();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
