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 /sd/source/ui/func | |
| 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 'sd/source/ui/func')
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/fuoaprms.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 523578bad564..1574d2d6b7ba 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -126,7 +126,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) pOV->InsertText( "" ); // prepare undo - ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); + SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), "", 0, mpViewShell->GetViewShellBase().GetViewShellId() ); @@ -237,7 +237,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) SfxItemSet aOldSet( mpDoc->GetPool(), svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO>{} ); aOldSet.Put( pOV->GetAttribs() ); - ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); + SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); ViewShellId nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : ViewShellId(-1); rUndoMgr.EnterListAction(SdResId(STR_UNDO_INSERT_SPECCHAR), "", 0, nViewShellId ); diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 1d1854d4906b..7915a1b8c783 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -75,7 +75,7 @@ rtl::Reference<FuPoor> FuObjectAnimationParameters::Create( ViewShell* pViewSh, void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) { - ::svl::IUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); + SfxUndoManager* pUndoMgr = mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager(); const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); |