add/use ScCaptionPtr::removeFromDrawPage()

Change-Id: Ibe073f071b120b61738b7e813a14824248f1fcfc

2 files changed, 21 insertions, 2 deletions

diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index dfb88c1428a8..c61df47be866 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -63,6 +63,11 @@ public:
      */
     void insertToDrawPage( SdrPage& rDrawPage );
 
+    /** Remove from draw page. The caption object is not owned anymore by the
+        draw page then.
+     */
+    void removeFromDrawPage( SdrPage& rDrawPage );
+
     /** Release all management of the SdrCaptionObj* in all instances of this
         list and dissolve. The SdrCaptionObj pointer returned is ready to be
         managed elsewhere.
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 8ed2e9f0d7ff..c01b6d772cc5 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -710,6 +710,20 @@ void ScCaptionPtr::insertToDrawPage( SdrPage& rDrawPage )
     mpHead->mbInDrawPage = true;
 }
 
+void ScCaptionPtr::removeFromDrawPage( SdrPage& rDrawPage )
+{
+    assert(mpHead && mpCaption);
+    SAL_WARN_IF(!mpHead->mbInDrawPage,"sc.core","ScCaptionPtr::removeFromDrawPage - not in draw page");
+    /* FIXME: that should assert, but currently fails in
+     * Test::testCopyToDocument() probably due to CopyStaticToDocument()
+     * lacking something. */
+    //assert(mpHead->mbInDrawPage);   // did we lose track anywhere?
+
+    SdrObject* pObj = rDrawPage.RemoveObject( mpCaption->GetOrdNum() );
+    assert(pObj == mpCaption); (void)pObj;
+    mpHead->mbInDrawPage = false;
+}
+
 SdrCaptionObj* ScCaptionPtr::release()
 {
     SdrCaptionObj* pTmp = mpCaption;
@@ -1081,10 +1095,10 @@ void ScPostIt::RemoveCaption()
             if( bRecording )
                 pDrawLayer->AddCalcUndo( new SdrUndoDelObj( *maNoteData.mxCaption.get() ) );
             // remove the object from the drawing page, delete if undo is disabled
-            SdrObject* pObj = pDrawPage->RemoveObject( maNoteData.mxCaption->GetOrdNum() );
+            maNoteData.mxCaption.removeFromDrawPage( *pDrawPage );
             if( !bRecording )
             {
-                maNoteData.mxCaption.release();
+                SdrObject* pObj = maNoteData.mxCaption.release();
                 SdrObject::Free( pObj );
             }
         }