sw/source/core/layout/ftnfrm.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 02bd12876efb4d4269dba4bd8f0d18b43c7894c9
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 17 16:24:10 2015 +0100
fix crash on export of ooo103108-1.odt .doc
stop pDel->Cut from deleting the pLastFtnFrm
that we still need
Change-Id: If5dc507ea58c613a581c0528160adaa5ca5364f3
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 6d21bf4..51f17f6 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2288,7 +2288,12 @@ void SwFtnBossFrm::RearrangeFtns( const SwTwips
nDeadLine, const bool bLock,
}
if( pDel )
{
+ bool bUnlockLastFtnFrmGuard = pLastFtnFrm &&
!pLastFtnFrm->IsColLocked();
+ if (bUnlockLastFtnFrmGuard)
+ pLastFtnFrm->ColLock();
pDel->Cut();
+ if (bUnlockLastFtnFrmGuard)
+ pLastFtnFrm->ColUnlock();
delete pDel;
}
if ( bMore )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
