diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-04 10:53:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-07-04 10:55:19 +0100 |
| commit | 8db705fc7542f3ee45eb5d8c1c70ccf15ecc7581 (patch) | |
| tree | c2a34fa58a7e67046ea70cc089d6028eaa6a8ceb /sw | |
| parent | a551d82bfc3ddae2354d39c90e31ad6eefcd1617 (diff) | |
crashtest: fix crash on load of ooo24889-1
regression from
Change-Id: Ie12713778112d1c6ddc9ed817af3998a3dcd9ba8
crashtest: don't crash on layout of ooo70429-[1|2]
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/fly.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index ecd4251881aa..0d926b1a3523 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. |