Revert "restore "crash on layout of novell622972-2.html" temporarily"

This reverts commit 46a76be3a13ad501e4d09da652f551b2c621e685.

CppunitTest_sw_uiwriter failure was unrelated to this

Change-Id: I2fb9d3cbf4730e4337a438db5ca66c77a87a133f

1 files changed, 1 insertions, 6 deletions

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 5289d58faf3a..904678877bbf 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;