diff options
| author | Armin Le Grand <alg@apache.org> | 2012-08-10 13:30:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-28 15:55:24 +0100 |
| commit | d7b7c9fdfe63deec26c420efc3ff1fd73c21bb27 (patch) | |
| tree | 4c615cd17d1dbbf62b091a1ba45288d3680192b6 /sw/source/core/inc/UndoManager.hxx | |
| parent | c726a1b12c9fdc91f32e6bed4d6dbd1edf73f9f8 (diff) | |
Resolves: #i120515# Implemented and finetuned the enhanced Undo feature
(see #i120498#) for sw
(cherry picked from commit fb2580f1c8ae0cd1418c257823dc2d735607655f)
Conflicts:
sw/source/core/draw/dview.cxx
sw/source/core/inc/UndoManager.hxx
sw/source/core/undo/docundo.cxx
Change-Id: I9970377d66f1104448a2ee7e4fb1cf82bf559cd8
Diffstat (limited to 'sw/source/core/inc/UndoManager.hxx')
| -rw-r--r-- | sw/source/core/inc/UndoManager.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx index 14696b380477..0db18261bf60 100644 --- a/sw/source/core/inc/UndoManager.hxx +++ b/sw/source/core/inc/UndoManager.hxx @@ -22,7 +22,7 @@ #include <IDocumentUndoRedo.hxx> #include <memory> -#include <svl/undo.hxx> +#include <svx/sdrundomanager.hxx> class IDocumentDrawModelAccess; class IDocumentRedlineAccess; @@ -32,7 +32,7 @@ namespace sw { class UndoManager : public IDocumentUndoRedo - , public SfxUndoManager + , public SdrUndoManager { public: UndoManager(::std::auto_ptr<SwNodes> pUndoNodes, @@ -102,7 +102,7 @@ private: bool impl_DoUndoRedo(UndoOrRedo_t const undoOrRedo); // UGLY: should not be called - using SfxUndoManager::Repeat; + using SdrUndoManager::Repeat; }; } // namespace sw |