mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashtesting: crash on layout of ooo107760-1.doc

Browse Source 
this has begun crashing since...

commit 8f2dd1df1d
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:   Wed Nov 2 23:52:06 2016 +0200

    "Enable the new text layout engine by default"

but its presumably blameless

Change-Id: I5d9bfcd3277ce6b71dce8dced6947ab38b12f148
This commit is contained in:
Caolán McNamara
2016-11-09 13:12:14 +00:00
parent 361d5819d5
commit c40e6060b2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sw/source/core/layout/flowfrm.cxx
View File

@@ -587,6 +587,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, SwFrame* pSibling )
//SwSectionFrame::MergeNext removing the pParent we're trying to reparent //SwSectionFrame::MergeNext removing the pParent we're trying to reparent
//into //into
FlowFrameJoinLockGuard aJoinGuard(pParent); FlowFrameJoinLockGuard aJoinGuard(pParent);
SwFrameDeleteGuard aDeleteGuard(pParent);
pOldParent = CutTree( &m_rThis ); pOldParent = CutTree( &m_rThis );
bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent ); bInvaLay = PasteTree( &m_rThis, pParent, pSibling, pOldParent );
} }

7
sw/source/core/layout/wsfrm.cxx
View File

@@ -963,8 +963,11 @@ void SwContentFrame::Cut()
if( pTmp ) if( pTmp )
pTmp->InvalidatePrt_(); pTmp->InvalidatePrt_();
} }
pUp->Cut(); if (!pUp->IsDeleteForbidden())
SwFrame::DestroyFrame(pUp); {
pUp->Cut();
SwFrame::DestroyFrame(pUp);
}
} }
else else
{ {