diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-21 15:55:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-22 09:54:36 +0200 |
| commit | e7fb44b8c86b4dce1d4c6f15752cc3bf62b14888 (patch) | |
| tree | 279810d0222144a9d6090f5cccd63747936f6730 /sw | |
| parent | 319c57d2af5d26d3910db4b02dca145d8881af44 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |