summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-17 13:24:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-24 07:58:23 +0100
commitcfb598178b2b38023c9237578904303bea7962e7 (patch)
tree42ba7bd9d613178ea21773ae7cf30cc94b02c7b3 /framework/inc
parent570786e75add710df9bf77fa53b75e22dc29de89 (diff)
loplugin:useuniqueptr in ImageListsDescriptor
Change-Id: I165af348b6d8863a4b1e5dd164d92c29f49d09c0 Reviewed-on: https://gerrit.libreoffice.org/48423 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/xml/imagesconfiguration.hxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 68291bea7a26..1ead958915cc 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -76,12 +76,10 @@ typedef std::vector<std::unique_ptr<ImageListItemDescriptor> > ImageListDescript
struct ImageListsDescriptor
{
- ImageListsDescriptor() : pImageList( nullptr ),
- pExternalImageList( nullptr ) {}
- ~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; }
+ ImageListsDescriptor() {}
- ImageListDescriptor* pImageList;
- ExternalImageItemListDescriptor* pExternalImageList;
+ std::unique_ptr<ImageListDescriptor> pImageList;
+ std::unique_ptr<ExternalImageItemListDescriptor> pExternalImageList;
};
class ImagesConfiguration