diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-13 16:16:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-15 11:27:20 +0200 |
| commit | 18e20676024baecaf5719139f80f053f5f1e784a (patch) | |
| tree | 54e7d15b178ee373c0c72e153d9b1a427963d889 /include | |
| parent | 82a7c54ad8b9b193e767fcafb5316d3f05e21001 (diff) | |
loplugin:useuniqueptr in OverlayObjectList
Change-Id: I641d93e54504c27bcc49bae8edf6286c0a9a471f
Reviewed-on: https://gerrit.libreoffice.org/59024
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdr/overlay/overlayobjectlist.hxx | 6 | ||||
| -rw-r--r-- | include/svx/svddrgmt.hxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index 0774ac16e436..8044ae70147d 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -23,6 +23,8 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <sal/types.h> #include <svx/svxdllapi.h> +#include <memory> +#include <vector> class Point; @@ -34,7 +36,7 @@ namespace sdr class SVX_DLLPUBLIC OverlayObjectList final { // the vector of OverlayObjects - OverlayObjectVector maVector; + ::std::vector< std::unique_ptr<OverlayObject> > maVector; public: OverlayObjectList() {} @@ -46,7 +48,7 @@ namespace sdr void clear(); // append objects (takes ownership) - void append(OverlayObject* pOverlayObject); + void append(std::unique_ptr<OverlayObject> pOverlayObject); // access to objects sal_uInt32 count() const { return maVector.size(); } diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index b51769d0e740..e4a501429c53 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -130,7 +130,7 @@ protected: virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact); // access for derivated classes to maOverlayObjectList (passes ownership) - void addToOverlayObjectList(sdr::overlay::OverlayObject* pNew) { maOverlayObjectList.append(pNew); } + void addToOverlayObjectList(std::unique_ptr<sdr::overlay::OverlayObject> pNew) { maOverlayObjectList.append(std::move(pNew)); } // access for derivated classes to mrSdrDragView SdrDragView& getSdrDragView() { return mrSdrDragView; } |