From 068c4df48fd1d9f4c42864733b80e7cbd7f5d006 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 8 May 2015 16:46:48 +0100 Subject: Resolves: ooo#119155 don't crash with odd content in footnotes hit it with a large and simple hammer Change-Id: Ib0e55ad64780efc7664ccd9a2684fbe7dba87498 --- sw/source/core/layout/calcmove.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sw/source/core/layout/calcmove.cxx') 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# -- cgit v1.2.3