From a4418108d13a9b19a6934f542c3b64499ecf18d2 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 11 Apr 2017 13:41:44 +0200 Subject: there are still cases where the caption pointer is dangling Change-Id: I8c186fa32d7fc3f26d7952268cb1e614025ecf37 --- sc/source/core/data/postit.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sc/source') diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index c8f244fb3e5b..cd76cebcc65f 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -692,6 +692,10 @@ void ScCaptionPtr::decRefAndDestroy() assert(!mpNext); // this must be one and only one assert(mpCaption); +#if 1 + // FIXME: there are still cases where the caption pointer is dangling + mpCaption = nullptr; +#else // Destroying Draw Undo deletes its SdrObject, don't attempt that twice. if (!mbInUndo) { @@ -705,6 +709,7 @@ void ScCaptionPtr::decRefAndDestroy() SdrObject::Free( pObj ); } } +#endif delete mpHead; mpHead = nullptr; } -- cgit