summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-10-20 14:54:59 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-10-20 14:54:59 +0200
commit6644620ee4226f00db9e0cbaf3d5e817646e6f43 (patch)
tree6844f89a41f14c0c55e30c784b8b3906764a4335 /editeng
parent5ee125ca789e7989a9725c40fe17fd3f8086a951 (diff)
undoapi: made SfxUndoManager an implementation of the new, abstract ::svl::IUndoManager interface.
Change the SfxShell's UndoManager attribute to be an IUndoManager. Did all the resulting changes up the source tree. This way, we'll hopefully be able to provide an IUndoManager implementation in Writer, which is not based on the SfxUndoManager, but on Writer's own Undo implementation.
Diffstat (limited to 'editeng')
-rwxr-xr-xediteng/inc/editeng/editeng.hxx7
-rw-r--r--editeng/inc/editeng/editund2.hxx2
-rw-r--r--editeng/inc/editeng/outliner.hxx10
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/outliner/outliner.cxx2
5 files changed, 16 insertions, 7 deletions
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 84f4802e7b44..642c290f4853 100755
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -33,7 +33,6 @@ class EditView;
class OutputDevice;
class EditUndo;
class SvxFont;
-class SfxUndoManager;
class SfxItemPool;
class SfxStyleSheet;
class String;
@@ -83,6 +82,9 @@ namespace svx{
struct SpellPortion;
typedef std::vector<SpellPortion> SpellPortions;
}
+namespace svl{
+class IUndoManager;
+}
namespace basegfx { class B2DPolyPolygon; }
#include <rsc/rscsfx.hxx>
@@ -268,7 +270,8 @@ public:
void ShowParagraph( USHORT nParagraph, BOOL bShow = TRUE );
BOOL IsParagraphVisible( USHORT nParagraph );
- SfxUndoManager& GetUndoManager();
+ ::svl::IUndoManager&
+ GetUndoManager();
void UndoActionStart( USHORT nId );
void UndoActionEnd( USHORT nId );
BOOL IsInUndo();
diff --git a/editeng/inc/editeng/editund2.hxx b/editeng/inc/editeng/editund2.hxx
index 83c4cf629b8e..14091ea3e1a7 100644
--- a/editeng/inc/editeng/editund2.hxx
+++ b/editeng/inc/editeng/editund2.hxx
@@ -33,7 +33,7 @@
class ImpEditEngine;
-class EDITENG_DLLPUBLIC EditUndoManager : public SfxUndoManager
+class EDITENG_DLLPRIVATE EditUndoManager : public SfxUndoManager
{
using SfxUndoManager::Undo;
using SfxUndoManager::Redo;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index d167d2a30f8f..900ee69af2d5 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -74,10 +74,15 @@ class SfxItemSet;
class SvxNumBulletItem;
class SvxNumberFormat;
class SvxLRSpaceItem;
-class SfxUndoManager;
class EditEngine;
class SvKeyValueIterator;
class SvxForbiddenCharactersTable;
+
+namespace svl
+{
+ class IUndoManager;
+}
+
#include <com/sun/star/uno/Reference.h>
#include <vos/ref.hxx>
@@ -938,7 +943,8 @@ public:
// nFormat muss ein Wert aus dem enum EETextFormat sein (wg.CLOOKS)
ULONG Read( SvStream& rInput, const String& rBaseURL, USHORT, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
- SfxUndoManager& GetUndoManager();
+ ::svl::IUndoManager&
+ GetUndoManager();
void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1b61a405dc18..74527ec2b86f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -145,7 +145,7 @@ sal_Bool EditEngine::IsInUndo()
return pImpEditEngine->IsInUndo();
}
-SfxUndoManager& EditEngine::GetUndoManager()
+::svl::IUndoManager& EditEngine::GetUndoManager()
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetUndoManager();
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 328a762fec54..19b5b67e28d4 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1227,7 +1227,7 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
pEditEngine->SetUpdateMode( bUpdate );
}
-SfxUndoManager& Outliner::GetUndoManager()
+::svl::IUndoManager& Outliner::GetUndoManager()
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetUndoManager();