sw/source/core/layout/fly.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8db705fc7542f3ee45eb5d8c1c70ccf15ecc7581
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jul 4 10:53:07 2015 +0100
crashtest: fix crash on load of ooo24889-1
regression from
Change-Id: Ie12713778112d1c6ddc9ed817af3998a3dcd9ba8
crashtest: don't crash on layout of ooo70429-[1|2]
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index ecd4251..0d926b1 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1464,12 +1464,12 @@ void CalcContent( SwLayoutFrm *pLay,
static_cast<SwTextFrm*>(pFrm)->ForbidFollowFormat();
const bool bDeleteForbidden(pSect && pSect->IsDeleteForbidden());
- if (pSect)
+ if (pSect && !bDeleteForbidden)
pSect->ForbidDelete();
pFrm->Calc(pRenderContext);
- if (!bDeleteForbidden)
+ if (pSect && !bDeleteForbidden)
pSect->AllowDelete();
// OD 14.03.2003 #i11760# - reset control flag for follow format.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
