sw: layout: fix crash in SwSectionFrame::MakeAll()
sectfrm.cxx:854: Assertion `moveBackPos == &GetPrecede()->GetFrame()' failed.
Because the section has columns, and GetPrevSctLeaf() apparently returns
the body frame in a column.
(regression from commit c60ad7e0fb)
Change-Id: I16fcd7a42b24e54873cde0aa0087c7aa56b0a8e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176738
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
@@ -846,6 +846,10 @@ void SwSectionFrame::MakeAll(vcl::RenderContext* pRenderContext)
|
||||
// appropriately; then drop the temporary, if needed.
|
||||
if (SwLayoutFrame* moveBackPos = GetPrevSctLeaf())
|
||||
{
|
||||
if (moveBackPos->IsColBodyFrame())
|
||||
{
|
||||
moveBackPos = moveBackPos->GetUpper()->GetUpper();
|
||||
}
|
||||
SwLayoutFrame* newUpper = moveBackPos;
|
||||
SwFrame* newSibling = nullptr;
|
||||
const bool temporaryMasterCreated = IsFollow();
|
||||
|
||||
Reference in New Issue
Block a user