[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/calcmove.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12d3b2c311c0122cdc182fbba4240dd52df5fdba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 21 15:55:46 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu May 23 16:09:35 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.Stahl at cib.de>
    (cherry picked from commit 07642832e3d9c3d1648324ef40bff09bfde1f6e5)
    Reviewed-on: https://gerrit.libreoffice.org/72850
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 04acfca33511..3c30ca26803b 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1233,7 +1233,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
     }
 
     if ( GetUpper()->IsSctFrame() &&
-         HasFollow() &&
+         HasFollow() && !GetFollow()->IsDeleteForbidden() &&
          &GetFollow()->GetFrame() == GetNext() )
     {
         dynamic_cast<SwTextFrame&>(*this).JoinFrame();