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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit.hxx | 6 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 4f8acffacdd4..5699c920878a 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -120,12 +120,12 @@ bool EditEngine::IsInUndo() return pImpEditEngine->IsInUndo(); } -::svl::IUndoManager& EditEngine::GetUndoManager() +SfxUndoManager& EditEngine::GetUndoManager() { return pImpEditEngine->GetUndoManager(); } -::svl::IUndoManager* EditEngine::SetUndoManager(::svl::IUndoManager* pNew) +SfxUndoManager* EditEngine::SetUndoManager(SfxUndoManager* pNew) { return pImpEditEngine->SetUndoManager(pNew); } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 741fa77b3da0..737b347a4192 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -732,7 +732,7 @@ public: ImpEditEngine& operator=(const ImpEditEngine&) = delete; inline EditUndoManager& GetUndoManager(); - inline ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); + inline SfxUndoManager* SetUndoManager(SfxUndoManager* pNew); void SetUpdateMode( bool bUp, EditView* pCurView = nullptr, bool bForceUpdate = false ); bool GetUpdateMode() const { return bUpdate; } @@ -1145,9 +1145,9 @@ inline EditUndoManager& ImpEditEngine::GetUndoManager() return *pUndoManager; } -inline ::svl::IUndoManager* ImpEditEngine::SetUndoManager(::svl::IUndoManager* pNew) +inline SfxUndoManager* ImpEditEngine::SetUndoManager(SfxUndoManager* pNew) { - ::svl::IUndoManager* pRetval = pUndoManager; + SfxUndoManager* pRetval = pUndoManager; if(pUndoManager) { diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index d595486c2fdb..294f000d3796 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1151,12 +1151,12 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ) pEditEngine->SetUpdateMode( bUpdate ); } -::svl::IUndoManager& Outliner::GetUndoManager() +SfxUndoManager& Outliner::GetUndoManager() { return pEditEngine->GetUndoManager(); } -::svl::IUndoManager* Outliner::SetUndoManager(::svl::IUndoManager* pNew) +SfxUndoManager* Outliner::SetUndoManager(SfxUndoManager* pNew) { return pEditEngine->SetUndoManager(pNew); } |