diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-08 16:46:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-08 16:56:43 +0100 |
| commit | 068c4df48fd1d9f4c42864733b80e7cbd7f5d006 (patch) | |
| tree | e0800d39acde399adf9c6624b53301d83ff0e340 /sw/source/core/layout | |
| parent | 99e60d8d62b69d8b0b22d54e3f55c5151e7a2c2f (diff) | |
Resolves: ooo#119155 don't crash with odd content in footnotes
hit it with a large and simple hammer
Change-Id: Ib0e55ad64780efc7664ccd9a2684fbe7dba87498
Diffstat (limited to 'sw/source/core/layout')
| -rw-r--r-- | sw/source/core/layout/calcmove.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index d808f5cbad39..2a8226398ed4 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1045,6 +1045,7 @@ void SwCntntFrm::MakeAll() return; } + ForbidDelete(); LockJoin(); long nFormatCount = 0; // - loop prevention @@ -1674,6 +1675,7 @@ void SwCntntFrm::MakeAll() delete pSaveFtn; UnlockJoin(); + AllowDelete(); if ( bMovedFwd || bMovedBwd ) pNotify->SetInvaKeep(); // OD 2004-02-26 #i25029# diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 57f81cc033d4..caf63ca5d59f 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -78,6 +78,7 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : mbValidPos = mbValidPrtArea = mbValidSize = mbValidLineNum = mbRetouche = mbFixSize = mbColLocked = false; mbCompletePaint = mbInfInvalid = true; + mbForbidDelete = false; } const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess() |