INTEGRATION: CWS oj14 (1.26.6); FILE MERGED

2007/06/26 20:13:31 fs 1.26.6.2: #i78908# ~SdrObject inaccessible now, need to use SdrObject::Free instead
2007/01/25 07:43:56 oj 1.26.6.1: add dtor of SdrUndoFactory()

svx/source/svdraw/svdundo.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: svdundo.cxx,v $
  *
- *  $Revision: 1.27 $
+ *  $Revision: 1.28 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 19:12:54 $
+ *  last change: $Author: rt $ $Date: 2007-07-06 07:43:02 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -766,7 +766,7 @@ SdrUndoObjList::~SdrUndoObjList()
         SetOwner(FALSE);
 
         // nun loeschen
-        delete pObj;
+        SdrObject::Free( pObj );
     }
 }
 
@@ -998,7 +998,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
         SetOldOwner(FALSE);
 
         // nun loeschen
-        delete pObj;
+        SdrObject::Free( pObj );
     }
     if (pNewObj!=NULL && IsNewOwner())
     {
@@ -1006,7 +1006,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
         SetNewOwner(FALSE);
 
         // nun loeschen
-        delete pNewObj;
+        SdrObject::Free( pNewObj );
     }
 }
 
@@ -1681,7 +1681,7 @@ XubString SdrUndoPageChangeMasterPage::GetComment() const
 }
 
 ///////////////////////////////////////////////////////////////////////
-
+SdrUndoFactory::~SdrUndoFactory(){}
 // shapes
 SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject )
 {