diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-09 08:42:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 15:55:23 +0100 |
| commit | 12a4200e8ff7f045efcc7e9d15a24b15b248c437 (patch) | |
| tree | 00363aedf07713ec9ff931d933b86a6b35e20267 /sd/inc/undo | |
| parent | 64b07d99aa0b31b3d04519afe6afe0cdf36bcd6f (diff) | |
Related: #i120498# Enhanced Undo/Redo and user experience...
when editing texts in graphic objects and/or tables
(cherry picked from commit a096725779b210c7a2706e72596fd7c80e049fdd)
Conflicts:
editeng/inc/editeng/editeng.hxx
editeng/inc/editeng/editund2.hxx
editeng/inc/editeng/outliner.hxx
editeng/source/editeng/editundo.cxx
editeng/source/editeng/impedit.hxx
editeng/source/outliner/outliner.cxx
sd/source/core/undo/undomanager.cxx
sd/source/ui/view/drviewse.cxx
svx/Library_svxcore.mk
svx/Package_inc.mk
svx/inc/svx/svdedxv.hxx
svx/source/svdraw/svdedxv.cxx
Change-Id: I40e3ef2dff681f9b6f2f6b5d35507071f8110533
Comment unused variable pNewEditUndoManager to silence the compiler
(cherry picked from commit 568655083af7830e7b9edf56ef862ddf9a99003b)
Change-Id: Ib7179ee6c34ce03a75942978831c3a55968f161f
Removed unused variable
(cherry picked from commit 0bbde4414badfd40234de4a4c9f750194f5d1d5e)
Change-Id: I39e7f25426e8e7d1367102d603b0f6c84d96622f
Diffstat (limited to 'sd/inc/undo')
| -rw-r--r-- | sd/inc/undo/undomanager.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 3aa9efda6700..14fa2d9811a4 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -20,13 +20,13 @@ #ifndef _SD_UNDOMANAGER_HXX #define _SD_UNDOMANAGER_HXX -#include "misc/scopelock.hxx" -#include <svl/undo.hxx> +#include <misc/scopelock.hxx> +#include <svx/sdrundomanager.hxx> namespace sd { -class UndoManager : public SfxUndoManager +class UndoManager : public SdrUndoManager { public: UndoManager( sal_uInt16 nMaxUndoActionCount = 20 ); @@ -40,8 +40,8 @@ public: void SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager); private: - using SfxUndoManager::Undo; - using SfxUndoManager::Redo; + using SdrUndoManager::Undo; + using SdrUndoManager::Redo; /** Used when the outline view is visible as a last resort to synchronize the undo managers. |