summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-08-10 13:30:31 +0000
committerArmin Le Grand <alg@apache.org>2012-08-10 13:30:31 +0000
commitfb2580f1c8ae0cd1418c257823dc2d735607655f (patch)
tree4a178e6482131c1fd25d665dbe2b3542969d9ab4 /sw/source/core/inc
parent472c175d1bb809db1dc997d9712d6ecb3fbe731c (diff)
#120515# Implemented and finetuned the enhanced Undo feature (see #120498#) for sw
Notes
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/UndoManager.hxx10
-rw-r--r--sw/source/core/inc/dview.hxx4
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index 82f94531d7e6..7f76cf867e6a 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -25,22 +25,18 @@
#define SW_UNDO_MANAGER_HXX
#include <IDocumentUndoRedo.hxx>
-
#include <memory>
-
-#include <svl/undo.hxx>
-
+#include <svx/sdrundomanager.hxx>
class IDocumentDrawModelAccess;
class IDocumentRedlineAccess;
class IDocumentState;
-
namespace sw {
class UndoManager
: public IDocumentUndoRedo
- , public SfxUndoManager
+ , public SdrUndoManager
{
public:
@@ -111,7 +107,7 @@ private:
bool impl_DoUndoRedo(UndoOrRedo_t const undoOrRedo);
// UGLY: should not be called
- using SfxUndoManager::Repeat;
+ using SdrUndoManager::Repeat;
};
} // namespace sw
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index b08aff31d3be..1a2017ce3482 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -31,6 +31,7 @@ class SwViewImp;
class SwFrm;
class SwFlyFrm;
class SwAnchoredObject;
+class SdrUndoManager;
class SwDrawView : public FmFormView
{
@@ -87,6 +88,9 @@ protected:
using FmFormView::CheckSingleSdrObjectHit;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const;
+ // support enhanced text edit for draw objects
+ virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const;
+
public:
SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice* pOutDev=NULL );