sd/source/ui/inc/View.hxx | 4 ++--
sd/source/ui/view/sdview.cxx | 10 +++-------
sd/source/ui/view/sdview2.cxx | 7 +++----
sd/source/ui/view/sdview3.cxx | 4 ++--
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit eb2a4fb53b92aaf9bef51748f75bbf82e071a0dc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jun 22 14:35:38 2018 +0200
loplugin:useuniqueptr in sd::View
Change-Id: I8902a792d9dc1ba2bc50a53c10a387f34af50307
Reviewed-on: https://gerrit.libreoffice.org/56339
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 962b6d43f56e..188788667839 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -238,9 +238,9 @@ protected:
SdDrawDocument& mrDoc;
DrawDocShell* mpDocSh;
ViewShell* mpViewSh;
- SdrMarkList* mpDragSrcMarkList;
+ std::unique_ptr<SdrMarkList> mpDragSrcMarkList;
SdrObject* mpDropMarkerObj;
- SdrDropMarkerOverlay* mpDropMarker;
+ std::unique_ptr<SdrDropMarkerOverlay> mpDropMarker;
sal_uInt16 mnDragSrcPgNum;
Point maDropPos;
::std::vector<OUString> maDropFileVector;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 835f9fcf9afb..d03cc9dfede4 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -146,11 +146,7 @@ View::View(
void View::ImplClearDrawDropMarker()
{
- if(mpDropMarker)
- {
- delete mpDropMarker;
- mpDropMarker = nullptr;
- }
+ mpDropMarker.reset();
}
View::~View()
@@ -531,7 +527,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool
bOnMasterPage, bool bCheckPresOb
/* Drag&Drop is in progress
Source and destination page are different:
we use the saved mark list */
- pMarkList = mpDragSrcMarkList;
+ pMarkList = mpDragSrcMarkList.get();
}
else
{
@@ -577,7 +573,7 @@ bool View::IsPresObjSelected(bool bOnPage, bool
bOnMasterPage, bool bCheckPresOb
}
}
- if (pMarkList != mpDragSrcMarkList)
+ if (pMarkList != mpDragSrcMarkList.get())
{
delete pMarkList;
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 710fa4b9147f..ce98918f0021 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -355,7 +355,7 @@ void View::StartDrag( const Point& rStartPos, vcl::Window*
pWindow )
static_cast<FuDraw*>(xFunction.get())->ForcePointer();
}
- mpDragSrcMarkList = new SdrMarkList(GetMarkedObjectList());
+ mpDragSrcMarkList.reset( new SdrMarkList(GetMarkedObjectList()) );
mnDragSrcPgNum = GetSdrPageView()->GetPage()->GetPageNum();
if( IsUndoEnabled() )
@@ -426,8 +426,7 @@ void View::DragFinished( sal_Int8 nDropAction )
if (bUndo && mpDragSrcMarkList)
EndUndo();
mnDragSrcPgNum = SDRPAGE_NOTFOUND;
- delete mpDragSrcMarkList;
- mpDragSrcMarkList = nullptr;
+ mpDragSrcMarkList.reset();
}
sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper&
rTargetHelper,
@@ -552,7 +551,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt,
DropTargetHelper& rTarge
if(mpDropMarkerObj)
{
- mpDropMarker = new SdrDropMarkerOverlay(*this,
*mpDropMarkerObj);
+ mpDropMarker.reset( new
SdrDropMarkerOverlay(*this, *mpDropMarkerObj) );
}
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 45382087aa8b..a710e7325ec4 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -447,7 +447,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
if( (mnDragSrcPgNum != SDRPAGE_NOTFOUND) &&
(mnDragSrcPgNum != pPV->GetPage()->GetPageNum()) )
{
- pMarkList = mpDragSrcMarkList;
+ pMarkList = mpDragSrcMarkList.get();
}
else
{
@@ -593,7 +593,7 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
for(ImpRememberOrigAndClone* p :
aConnectorContainer)
delete p;
- if( pMarkList != mpDragSrcMarkList )
+ if( pMarkList != mpDragSrcMarkList.get() )
delete pMarkList;
bReturn = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
