diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-12 09:42:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-13 08:39:15 +0200 |
| commit | 2d71dd52b6d91660cda6cb8f9457463439f56e20 (patch) | |
| tree | f894d34e604eee2db24978c85ba67b9da0a4d573 /include/sfx2 | |
| parent | ddef60b9c26b1d2990c6c49dbbda73e7831f21fb (diff) | |
merge IUndoManager into SfxUndoManager
SfxUndoManager is the only implementation of the IUnderManager
"interface", and it lives in the same header.
Plus this way we can get rid of some covariant parameters,
which will make using std::unique_ptr easier.
Change-Id: I6661b9876b18da830bead78794d237886cd3c5c9
Reviewed-on: https://gerrit.libreoffice.org/57317
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/shell.hxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 7aeeed54bdd2..d2d72093338a 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -57,11 +57,7 @@ class SbxVariable; class SbxBase; class SfxBindings; class SfxModule; - -namespace svl -{ - class IUndoManager; -} +class SfxUndoManager; /** Id for <SfxInterface>s, gives a quasi-static access to the interface @@ -143,7 +139,7 @@ class SFX2_DLLPUBLIC SfxShell: public SfxBroadcaster std::unique_ptr< SfxShell_Impl > pImpl; SfxItemPool* pPool; - ::svl::IUndoManager* pUndoMgr; + SfxUndoManager* pUndoMgr; private: SfxShell( const SfxShell & ) = delete; @@ -298,7 +294,7 @@ public: The class SfxShell itself does not have a SfxUndoManager, a NULL-pointer is therefore returned. */ - virtual ::svl::IUndoManager* GetUndoManager(); + virtual SfxUndoManager* GetUndoManager(); /** Sets a <SfxUndoManager> for this <SfxShell> Instance. For the undo @@ -311,7 +307,7 @@ public: 'pNewUndoMgr' must exist until the Destructor of SfxShell instance is called or until the next 'SetUndoManager()'. */ - void SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ); + void SetUndoManager( SfxUndoManager *pNewUndoMgr ); /** Returns a pointer to the <SfxRepeatTarget> instance that is used in |