diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-09 10:47:29 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-09 11:31:52 +0100 |
commit | 64dc505ce180a168798b725423a308207de42c63 (patch) | |
tree | 92360cf167bc6ee98c89a9a09c1716ff2c8fed20 | |
parent | 233a52af646f73a9ef0d53dd27f2823e8c362728 (diff) |
Resolves: tdf#91695 partially Revert "crash on layout of novell622972-2.html"
This reverts commit 9857c6390212e16dd9f26b47b4afc5d33b5242ef.
Change-Id: Id47e982eb346c092991f07964c0146daefccb031
-rw-r--r-- | sw/source/core/layout/layact.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 26f43eec8936..35a2fd244869 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1239,12 +1239,7 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect ) aOldRect = static_cast<SwPageFrm*>(pLay)->GetBoundRect(); } - { - //JoinLock pParent for the lifetime of the Calc call to avoid - //SwSectionFrm::MergeNext removing the pLay we're trying to Format - FlowFrmJoinLockGuard aJoinGuard(pLay); - pLay->Calc(); - } + pLay->Calc(); if ( aOldFrame != pLay->Frm() ) bChanged = true; |