sw/source/core/layout/layact.cxx | 1 -
1 file changed, 1 deletion(-)
New commits:
commit b72e63fd5a7caf373eb42bedb2f7db49cef04e91
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Oct 7 11:41:47 2015 +0100
crashtesting: remove old fix for ooo55381-1.sxw
this reverts
commit 9eb16c85d6af4b73de9a75716c3ff34f929f26b2
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jun 3 14:15:03 2015 +0100
don't crash on layout of ooo55381-1.sxw
The pLay here is getting joined and thus deleted in a stack of
FormatLayoutTabs so set it as unjoinable for the duration that
we expect pLay to remain valid
because ooo31216-2.doc fdo57780-2.doc rhbz193771-1.doc assert when
converting
it to a more conservative SwFrmDeleteGuard. They would leave the function
safely on the early return if the delete was allowed, so go more
conservative
again and restore to the original logic.
ooo55381-1.sxw continues to apparently not fail.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index f1e81cc..6bda3ef 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1374,7 +1374,6 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrm *pLay,
if ( pLay->IsFootnoteFrm() ) // no LayFrms as Lower
return bChanged;
- SwFrmDeleteGuard aDeleteGuard(pLay);
SwFrm *pLow = pLay->Lower();
bool bTabChanged = false;
while ( pLow && pLow->GetUpper() == pLay )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
