diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-13 11:36:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-16 08:38:49 +0200 |
| commit | 8bcea1698c6ec45923a7675ab1250204e952527d (patch) | |
| tree | 44ca898b4ed473eb60e7791e1f3488a56961bba8 | |
| parent | e7a252166e2d88b4e16f25a04f1d5072236e8c5e (diff) | |
loplugin:useuniqueptr in SwSdrUndo
Change-Id: I67276f2cd13cce8a7cb047216ead40c5afc384bd
Reviewed-on: https://gerrit.libreoffice.org/57423
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sw/source/core/inc/UndoDraw.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/undo/undraw.cxx | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 8229c2a8e77e..7df31833a46a 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -36,8 +36,8 @@ class SwDoc; // Undo for Draw Objects class SwSdrUndo : public SwUndo { - SdrUndoAction* pSdrUndo; - SdrMarkList* pMarkList; // MarkList for all selected SdrObjects + std::unique_ptr<SdrUndoAction> pSdrUndo; + std::unique_ptr<SdrMarkList> pMarkList; // MarkList for all selected SdrObjects public: SwSdrUndo( SdrUndoAction* , const SdrMarkList* pMarkList, const SwDoc* pDoc ); diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index f007d86eee08..9d164095ac5d 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -75,27 +75,25 @@ SwSdrUndo::SwSdrUndo( SdrUndoAction* pUndo, const SdrMarkList* pMrkLst, const Sw : SwUndo( SwUndoId::DRAWUNDO, pDoc ), pSdrUndo( pUndo ) { if( pMrkLst && pMrkLst->GetMarkCount() ) - pMarkList = new SdrMarkList( *pMrkLst ); - else - pMarkList = nullptr; + pMarkList.reset( new SdrMarkList( *pMrkLst ) ); } SwSdrUndo::~SwSdrUndo() { - delete pSdrUndo; - delete pMarkList; + pSdrUndo.reset(); + pMarkList.reset(); } void SwSdrUndo::UndoImpl(::sw::UndoRedoContext & rContext) { pSdrUndo->Undo(); - rContext.SetSelections(nullptr, pMarkList); + rContext.SetSelections(nullptr, pMarkList.get()); } void SwSdrUndo::RedoImpl(::sw::UndoRedoContext & rContext) { pSdrUndo->Redo(); - rContext.SetSelections(nullptr, pMarkList); + rContext.SetSelections(nullptr, pMarkList.get()); } OUString SwSdrUndo::GetComment() const |