sw/source/core/layout/calcmove.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7fb44b8c86b4dce1d4c6f15752cc3bf62b14888
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 21 15:55:46 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 22 09:54:36 2019 +0200
crashtesting: failure on layout of tdf92372-4.odt
Change-Id: I8d5bb318674311b1e21c6fdf487d69609af344a5
Reviewed-on: https://gerrit.libreoffice.org/72686
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/layout/calcmove.cxx
b/sw/source/core/layout/calcmove.cxx
index 914b179a692b..6e64c2903da6 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1234,7 +1234,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
