[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/layout/layact.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 46a76be3a13ad501e4d09da652f551b2c621e685
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 9 11:42:06 2015 +0100

    restore "crash on layout of novell622972-2.html" temporarily
    
    This reverts commit dfedebd1e1912252bc2b5204a2b5371952b552cd.

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 9046788..5289d58 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1239,7 +1239,12 @@ bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, bool bAddRect )
             aOldRect = static_cast<SwPageFrm*>(pLay)->GetBoundRect();
         }
 
-        pLay->Calc();
+        {
+            //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();
+        }
 
         if ( aOldFrame != pLay->Frm() )
             bChanged = true;