diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 13:06:08 +0100 |
commit | dde0ca60a7619e03c7ed5a4ddacfb048dd159ab7 (patch) | |
tree | 66e5a71ff830f75382ce388b33021db01c3fd4c4 /sd/inc | |
parent | c64664f9e281980106741fc759d2faa190009b22 (diff) | |
parent | 1a0a7970636e093d015267b828ecd8d5c2543541 (diff) |
removetooltypes01: Rebase to DEV300m99
Diffstat (limited to 'sd/inc')
-rwxr-xr-x | sd/inc/undo/undomanager.hxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index dcb6de7bf458..22167d9636fc 100755 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -40,31 +40,21 @@ public: UndoManager( sal_uInt16 nMaxUndoActionCount = 20 ); virtual void EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId=0); - virtual void LeaveListAction(); virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); - bool isInListAction() const { return mnListLevel != 0; } - bool isInUndo() const { return maIsInUndoLock.isLocked(); } - - virtual sal_Bool Undo( sal_uInt16 nCount=1 ); - virtual sal_Bool Redo( sal_uInt16 nCount=1 ); - /** 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. |