commit 24d935164f553bb4daa9be591c9cb392a86f06cd
author Eike Rathke <erack@redhat.com> Tue Apr 11 13:41:44 2017 +0200
committer Eike Rathke <erack@redhat.com> Tue Apr 11 13:42:48 2017 +0200
tree 05e097e2983383da63dbcad6e887a3c611e874ea
parent 036fcf2a4c0b630548a93bb20bd861940ba295f0

there are still cases where the caption pointer is dangling

Change-Id: I8c186fa32d7fc3f26d7952268cb1e614025ecf37

sc/source/core/data/postit.cxx

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 02502ed..d2ef02f 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;
    }