diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 09:06:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-03 08:20:56 +0200 |
| commit | 72ec9cc3ace02e1ba15aa5843bc110b34b1d30a4 (patch) | |
| tree | 96ce3c4345d7d9b9eb6881fe2e65b897de86da74 | |
| parent | 5175e38d823ff11025d8f1df8f4f6ad9ed6b03e2 (diff) | |
loplugin:useuniqueptr in SdrCreateView
Change-Id: I41f3441593afa1884d5e8cda4126e97b545fd0a8
Reviewed-on: https://gerrit.libreoffice.org/53750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svx/svdcrtv.hxx | 3 | ||||
| -rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 47858b29cf4e..add5d962ed59 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -22,6 +22,7 @@ #include <svx/svddrgv.hxx> #include <svx/svxdllapi.h> +#include <memory> class XLineAttrSetItem; class XFillAttrSetItem; @@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SdrCreateView : public SdrDragView protected: SdrObject* pCurrentCreate; // The currently being created object SdrPageView* pCreatePV; // Here, the creation is started - ImplConnectMarkerOverlay* mpCoMaOverlay; + std::unique_ptr<ImplConnectMarkerOverlay> mpCoMaOverlay; // for migrating stuff from XOR, use ImpSdrCreateViewExtraData ATM to not need to // compile the apps all the time diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index c015fe69a848..a1529088dbae 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -175,11 +175,7 @@ void ImpSdrCreateViewExtraData::HideOverlay() void SdrCreateView::ImpClearConnectMarker() { - if(mpCoMaOverlay) - { - delete mpCoMaOverlay; - mpCoMaOverlay = nullptr; - } + mpCoMaOverlay.reset(); } void SdrCreateView::ImpClearVars() @@ -201,7 +197,6 @@ SdrCreateView::SdrCreateView( SdrModel& rSdrModel, OutputDevice* pOut) : SdrDragView(rSdrModel, pOut), - mpCoMaOverlay(nullptr), mpCreateViewExtraData(new ImpSdrCreateViewExtraData()) { ImpClearVars(); @@ -295,7 +290,7 @@ void SdrCreateView::SetConnectMarker(const SdrObjConnection& rCon) if(!mpCoMaOverlay) { - mpCoMaOverlay = new ImplConnectMarkerOverlay(*this, *pTargetObject); + mpCoMaOverlay.reset(new ImplConnectMarkerOverlay(*this, *pTargetObject)); } } else |