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 /sfx2/source/control | |
| 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 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 970ca26c3260..3c48c749625e 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -201,12 +201,12 @@ SfxInterface* SfxShell::GetInterface() const return GetStaticInterface(); } -::svl::IUndoManager* SfxShell::GetUndoManager() +SfxUndoManager* SfxShell::GetUndoManager() { return pUndoMgr; } -void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) +void SfxShell::SetUndoManager( SfxUndoManager *pNewUndoMgr ) { OSL_ENSURE( ( pUndoMgr == nullptr ) || ( pNewUndoMgr == nullptr ) || ( pUndoMgr == pNewUndoMgr ), "SfxShell::SetUndoManager: exchanging one non-NULL manager with another non-NULL manager? Suspicious!" ); |