Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 5 insertions, 15 deletions

diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index 9702fff68ac5..68437afe6703 100644..100755
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -38,34 +38,24 @@ namespace sd
 class UndoManager : public SfxUndoManager
 {
 public:
-    UndoManager( USHORT nMaxUndoActionCount = 20 );
+    UndoManager( sal_uInt16 nMaxUndoActionCount = 20 );
 
-    virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId=0);
-    virtual void            LeaveListAction();
+    virtual void            EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0);
 
-    virtual void            AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
-
-    bool                    isInListAction() const { return mnListLevel != 0; }
-    bool                    isInUndo() const { return maIsInUndoLock.isLocked(); }
-
-    virtual BOOL            Undo( USHORT nCount=1 );
-    virtual BOOL            Redo( USHORT nCount=1 );
+    virtual void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
 
     /** Set or reset the undo manager linked with the called undo manager.
     */
-    void SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager);
+    void SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager);
 
 private:
     using SfxUndoManager::Undo;
     using SfxUndoManager::Redo;
 
-    int mnListLevel;
-    ScopeLock maIsInUndoLock;
-
     /** Used when the outline view is visible as a last resort to
         synchronize the undo managers.
     */
-    SfxUndoManager* mpLinkedUndoManager;
+    ::svl::IUndoManager* mpLinkedUndoManager;
 
     /** Call ClearRedo() at the linked undo manager, when present.