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 /sc/source/ui/drawfunc | |
| 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 'sc/source/ui/drawfunc')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drtxtob.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/futext3.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index a1cc5388a2ea..4b2880676407 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -61,7 +61,7 @@ ScDrawShell::ScDrawShell( ScViewData* pData ) : vcl::EnumContext::Context::Cell)) { SetPool( &pViewData->GetScDrawView()->GetModel()->GetItemPool() ); - ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); + SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); SetUndoManager( pMgr ); if ( !pViewData->GetDocument()->IsUndoEnabled() ) { diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index a1720a8b73db..b4418e7f8750 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -117,7 +117,7 @@ ScDrawTextObjectBar::ScDrawTextObjectBar(ScViewData* pData) : SetPool( pViewData->GetScDrawView()->GetDefaultAttr().GetPool() ); // At the switching-over the UndoManager is changed to edit mode - ::svl::IUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); + SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); SetUndoManager( pMgr ); if ( !pViewData->GetDocument()->IsUndoEnabled() ) { diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 4a003558c88d..fe33bb3d3c70 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -72,7 +72,7 @@ void FuText::StopEditMode() } ScDocShell* pDocShell = rViewData.GetDocShell(); - ::svl::IUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : nullptr; + SfxUndoManager* pUndoMgr = rDoc.IsUndoEnabled() ? pDocShell->GetUndoManager() : nullptr; bool bNewNote = false; if( pNote && pUndoMgr ) { |