diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-31 14:36:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-01 06:44:26 +0100 |
| commit | 15c86cadadcd389bfcf80ca285c1c298353d987f (patch) | |
| tree | 5b03dcae0c545dea73ceb1abefe13b46970ec290 /sd | |
| parent | ef9bfdfe4f4ef75ca65547face0db09af7352314 (diff) | |
rename RemoveX->Remove in SfxUndoArray
accidentally left it this way when doing
commit 19e715973e15f9e7cf6e8237643dbbc14f8eb87a
Date: Mon Oct 29 16:15:27 2018 +0200
loplugin:useuniqueptr in MarkedUndoAction
Change-Id: I250676df7af27f485c5d34281ef0da1e127eb24c
Reviewed-on: https://gerrit.libreoffice.org/62694
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/outlview.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index f2264eff09f5..544785643416 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1524,7 +1524,7 @@ void OutlineView::TryToMergeUndoActions() // first remove the merged undo action assert( pListAction->GetUndoAction(nEditPos) == pEditUndo && "sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" ); - pListAction->RemoveX(nEditPos); + pListAction->Remove(nEditPos); if ( !pListAction->maUndoActions.empty() ) { @@ -1535,7 +1535,7 @@ void OutlineView::TryToMergeUndoActions() size_t nDestAction = pPrevListAction->maUndoActions.size(); while( nCount-- ) { - std::unique_ptr<SfxUndoAction> pTemp = pListAction->RemoveX(0); + std::unique_ptr<SfxUndoAction> pTemp = pListAction->Remove(0); pPrevListAction->Insert( std::move(pTemp), nDestAction++ ); } pPrevListAction->nCurUndoAction = pPrevListAction->maUndoActions.size(); |