diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-22 13:25:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-23 09:31:20 +0200 |
| commit | d1e47b1428abf1732ab4d5e219b210760d4152e0 (patch) | |
| tree | 8eac1def834ba548c45a8a1a18e8e39d45eedc1d /svx | |
| parent | 919a4ef592b6026a7533a93682f39118fef29ce8 (diff) | |
enhance useuniqueptr loplugin
teach it to look for the following sequence in a destructor:
delete m_pfoo;
m_pfoo = nullptr;
Change-Id: Icd6271a63a024e32b53cc9e599f8f59952160380
Reviewed-on: https://gerrit.libreoffice.org/37900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx | 3 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index efe62f09f7c2..76eaeaa128da 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -23,6 +23,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <tools/gen.hxx> +#include <memory> namespace avmedia { class MediaItem; } namespace vcl { class Window; } @@ -53,7 +54,7 @@ namespace sdr private: - sdr::contact::SdrMediaWindow* mpMediaWindow; + std::unique_ptr<sdr::contact::SdrMediaWindow> mpMediaWindow; }; } // end of namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index a239c3b303e3..46f4378f7f52 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -43,7 +43,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r if( pWindow ) { - mpMediaWindow = new SdrMediaWindow( pWindow, *this ); + mpMediaWindow.reset( new SdrMediaWindow( pWindow, *this ) ); mpMediaWindow->hide(); executeMediaItem( rMediaItem ); } @@ -54,8 +54,6 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() { - delete mpMediaWindow; - mpMediaWindow = nullptr; } |