Kaydet (Commit) 72ec9cc3 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in SdrCreateView

Change-Id: I41f3441593afa1884d5e8cda4126e97b545fd0a8
Reviewed-on: https://gerrit.libreoffice.org/53750Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5175e38d
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <svx/svddrgv.hxx> #include <svx/svddrgv.hxx>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <memory>
class XLineAttrSetItem; class XLineAttrSetItem;
class XFillAttrSetItem; class XFillAttrSetItem;
...@@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SdrCreateView : public SdrDragView ...@@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SdrCreateView : public SdrDragView
protected: protected:
SdrObject* pCurrentCreate; // The currently being created object SdrObject* pCurrentCreate; // The currently being created object
SdrPageView* pCreatePV; // Here, the creation is started 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 // for migrating stuff from XOR, use ImpSdrCreateViewExtraData ATM to not need to
// compile the apps all the time // compile the apps all the time
......
...@@ -175,11 +175,7 @@ void ImpSdrCreateViewExtraData::HideOverlay() ...@@ -175,11 +175,7 @@ void ImpSdrCreateViewExtraData::HideOverlay()
void SdrCreateView::ImpClearConnectMarker() void SdrCreateView::ImpClearConnectMarker()
{ {
if(mpCoMaOverlay) mpCoMaOverlay.reset();
{
delete mpCoMaOverlay;
mpCoMaOverlay = nullptr;
}
} }
void SdrCreateView::ImpClearVars() void SdrCreateView::ImpClearVars()
...@@ -201,7 +197,6 @@ SdrCreateView::SdrCreateView( ...@@ -201,7 +197,6 @@ SdrCreateView::SdrCreateView(
SdrModel& rSdrModel, SdrModel& rSdrModel,
OutputDevice* pOut) OutputDevice* pOut)
: SdrDragView(rSdrModel, pOut), : SdrDragView(rSdrModel, pOut),
mpCoMaOverlay(nullptr),
mpCreateViewExtraData(new ImpSdrCreateViewExtraData()) mpCreateViewExtraData(new ImpSdrCreateViewExtraData())
{ {
ImpClearVars(); ImpClearVars();
...@@ -295,7 +290,7 @@ void SdrCreateView::SetConnectMarker(const SdrObjConnection& rCon) ...@@ -295,7 +290,7 @@ void SdrCreateView::SetConnectMarker(const SdrObjConnection& rCon)
if(!mpCoMaOverlay) if(!mpCoMaOverlay)
{ {
mpCoMaOverlay = new ImplConnectMarkerOverlay(*this, *pTargetObject); mpCoMaOverlay.reset(new ImplConnectMarkerOverlay(*this, *pTargetObject));
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment