diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-05 11:10:31 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-07 09:15:22 +0100 |
commit | afeda72187e69d7bc8d7e37d98cce7601e2ffde8 (patch) | |
tree | 9956428367153624e57364d93f256b2493a6f32e /svx | |
parent | 72fefd7ab6fd551effcf821e4e257df2756bece1 (diff) |
loplugin:useuniqueptr in SdrUndoGeoObj
Change-Id: I8b48642a3a6ab4d94c1b58f8dae3589e703612b1
Reviewed-on: https://gerrit.libreoffice.org/49329
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index ecc2c78d90dd..ba2bff175356 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -581,9 +581,6 @@ OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) : SdrUndoObj(rNewObj) - , pUndoGeo(nullptr) - , pRedoGeo(nullptr) - , pUndoGroup(nullptr) , mbSkipChangeLayout(false) { SdrObjList* pOL=rNewObj.GetSubList(); @@ -592,7 +589,7 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) // this is a group object! // If this were 3D scene, we'd only add an Undo for the scene itself // (which we do elsewhere). - pUndoGroup=new SdrUndoGroup(*pObj->GetModel()); + pUndoGroup.reset(new SdrUndoGroup(*pObj->GetModel())); const size_t nObjCount = pOL->GetObjCount(); for (size_t nObjNum = 0; nObjNum<nObjCount; ++nObjNum) { pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum))); @@ -600,15 +597,15 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj) } else { - pUndoGeo=pObj->GetGeoData(); + pUndoGeo.reset(pObj->GetGeoData()); } } SdrUndoGeoObj::~SdrUndoGeoObj() { - delete pUndoGeo; - delete pRedoGeo; - delete pUndoGroup; + pUndoGeo.reset(); + pRedoGeo.reset(); + pUndoGroup.reset(); } void SdrUndoGeoObj::Undo() @@ -625,8 +622,7 @@ void SdrUndoGeoObj::Undo() } else { - delete pRedoGeo; - pRedoGeo=pObj->GetGeoData(); + pRedoGeo.reset(pObj->GetGeoData()); auto pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pObj); if (pTableObj && mbSkipChangeLayout) @@ -648,8 +644,7 @@ void SdrUndoGeoObj::Redo() } else { - delete pUndoGeo; - pUndoGeo=pObj->GetGeoData(); + pUndoGeo.reset(pObj->GetGeoData()); pObj->SetGeoData(*pRedoGeo); } |