diff options
author | Eike Rathke <erack@redhat.com> | 2017-04-11 13:41:44 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2017-05-15 21:59:07 +0200 |
commit | a4418108d13a9b19a6934f542c3b64499ecf18d2 (patch) | |
tree | 01230b3354921f2060a1f4f6a4779b47d3148d9f /sc/source | |
parent | d091cc41bf44ce3f69151e2765d1148969d25170 (diff) |
there are still cases where the caption pointer is dangling
Change-Id: I8c186fa32d7fc3f26d7952268cb1e614025ecf37
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/postit.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |