sw/source/core/layout/sectfrm.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 652454378c5e77e11d9fb9cc399ccb74387a0229
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 13 15:39:54 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 14 17:21:19 2018 +0200
crashtesting: IsSctFrame assert
we have two asserting cases...
soffice.bin --headless --convert-to pdf odt/tdf109532-2.odt
soffice.bin --headless --convert-to odt odt/fdo45450-1.odt
both pass after this
Change-Id: I24a9bdc5ab19f678dc611f78ed84347789915cc5
Reviewed-on: https://gerrit.libreoffice.org/58939
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/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 2c3acaf41527..7824ae0e40f8 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1766,8 +1766,11 @@ SwLayoutFrame *SwFrame::GetNextSctLeaf( MakePageType
eMakePage )
if (parents.size() >= 2 &&
parents[0]->IsBodyFrame() && parents[1]->IsColumnFrame())
{ // this only inserts section frame - remove column
- assert(parents[2]->IsSctFrame());
- std::advance(iter, +2);
+ assert(parents[2]->IsSctFrame() || IsSctFrame());
+ if (parents[2]->IsSctFrame())
+ std::advance(iter, +2);
+ else
+ pTmp = pTmp->GetUpper();
}
else if (IsBodyFrame() && parents.size() >= 1
&& parents[0]->IsColumnFrame())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
