sw/source/core/layout/layact.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit dfedebd1e1912252bc2b5204a2b5371952b552cd
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 9 10:47:29 2015 +0100
Resolves: tdf#91695 partially Revert "crash on layout of
novell622972-2.html"
This reverts commit 9857c6390212e16dd9f26b47b4afc5d33b5242ef.
Change-Id: Id47e982eb346c092991f07964c0146daefccb031
(cherry picked from commit 64dc505ce180a168798b725423a308207de42c63)
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 5289d58..9046788 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
