INTEGRATION: CWS impresspresobjs (1.39.16); FILE MERGED

2005/11/24 12:02:48 cl 1.39.16.1: #123595# consolidated undo manager with drawing layer undo manager, moved away some undo stuff and removed deleted presobj list

1 files changed, 8 insertions, 32 deletions

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index cd7b6f8e9239..84cf2ab56583 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: drawdoc.hxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: rt $ $Date: 2005-10-19 12:22:56 $
+ *  last change: $Author: rt $ $Date: 2006-01-10 14:22:41 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -145,6 +145,7 @@ namespace sd
 SV_DECL_REF(DrawDocShell)
 #endif
 class DrawDocShell;
+class UndoManager;
 }
 
 class ImpDrawPageListWatcher;
@@ -164,27 +165,6 @@ enum DocCreationMode
     DOC_LOADED
 };
 
-//////////////////////////////////////////////////////////////////////////////
-// #107844#
-// An undo class which is able to set/unset user calls is needed to handle
-// the undo/redo of PresObjs correctly. It can also add/remove the object
-// from the PresObjList of that page.
-
-class SD_DLLPUBLIC SdrUndoUserCallObj : public SdrUndoObj
-{
-protected:
-    SdPage*                         mpOld;
-    SdPage*                         mpNew;
-    PresObjKind                     meKind;
-
-public:
-    SdrUndoUserCallObj(SdrObject& rNewObj, SdPage* pNew);
-    SdrUndoUserCallObj(SdrObject& rNewObj, SdPage* pOld, SdPage* pNew);
-
-    virtual void Undo();
-    virtual void Redo();
-};
-
 namespace sd
 {
     struct PresentationSettings
@@ -222,7 +202,6 @@ private:
     Timer*              pWorkStartupTimer;
     Timer*              pOnlineSpellingTimer;
     List*               pOnlineSpellingList;
-    List*               pDeletedPresObjList;
     SvxSearchItem*      pOnlineSearchItem;
     List*               pFrameViewList;
     List*               pCustomShowList;
@@ -244,7 +223,6 @@ private:
     LanguageType        eLanguageCJK;
     LanguageType        eLanguageCTL;
     SvxNumType          ePageNumType;
-    Link                aOldNotifyUndoActionHdl;
     ::sd::DrawDocShellRef   xAllocedDocShRef;   // => AllocModel()
     BOOL                bAllocDocSh;        // => AllocModel()
     DocumentType        eDocType;
@@ -261,7 +239,6 @@ private:
     void                FillOnlineSpellingList(SdPage* pPage);
     void                SpellObject(SdrTextObj* pObj);
 
-                        DECL_LINK(NotifyUndoActionHdl, SfxUndoAction*);
                         DECL_LINK(WorkStartupHdl, Timer*);
                         DECL_LINK(OnlineSpellingHdl, Timer*);
                         DECL_LINK(OnlineSpellEventHdl, EditStatus*);
@@ -481,19 +458,16 @@ public:
         return static_cast< ::sd::FrameView*>(
             pFrameViewList->GetObject(nPos));}
 
+    /** deprecated*/
     SdAnimationInfo*    GetAnimationInfo(SdrObject* pObject) const;
 
+    static  SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false );
+
     SdIMapInfo*         GetIMapInfo( SdrObject* pObject ) const;
     IMapObject*         GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd );
 
     Graphic             GetGraphicFromOle2Obj( const SdrOle2Obj* pOle2Obj );
 
-    List*               GetDeletedPresObjList();
-    /** Clear the list of deleted presentation objects.  Call this
-        method when the undo stack is also cleared.
-    */
-    void ClearDeletedPresObjList (void);
-
     CharClass*          GetCharClass() const { return mpCharClass; }
     International*      GetInternational() const { return mpInternational; }
 
@@ -637,6 +611,8 @@ public:
         languages set at this document */
     void getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont );
 
+    sd::UndoManager* GetUndoManager() const;
+
 private:
     /** This member stores the printer independent layout mode.  Please
         refer to <member>SetPrinterIndependentLayout()</member> for its