summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdfmtf.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-06-13 11:27:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-06-13 11:27:48 +0200
commit16265a1f84f0ac7c16beee6a3591653eaaa90323 (patch)
tree981ae7e44fb7200d732931be59fe25e0f3b23ba1 /svx/source/svdraw/svdfmtf.hxx
parent5df3b28a24825653ca112dd3e709aad3e4f4630a (diff)
Use unique_ptr for ImpSdrGDIMetaFileImport::mp*Attr
Change-Id: I8bfe10e46cfaacb329998b11fe507c2302fe2d44
Diffstat (limited to 'svx/source/svdraw/svdfmtf.hxx')
-rw-r--r--svx/source/svdraw/svdfmtf.hxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 25621d7ac7cf..7b3d0d12315a 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX
#define INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX
+#include <sal/config.h>
+
+#include <memory>
+
#include <tools/contnr.hxx>
#include <tools/fract.hxx>
#include <vcl/metaact.hxx>
@@ -46,9 +50,9 @@ protected:
ScopedVclPtr<VirtualDevice> mpVD;
tools::Rectangle maScaleRect;
size_t mnMapScalingOfs; // from here on, not edited with MapScaling
- SfxItemSet* mpLineAttr;
- SfxItemSet* mpFillAttr;
- SfxItemSet* mpTextAttr;
+ std::unique_ptr<SfxItemSet> mpLineAttr;
+ std::unique_ptr<SfxItemSet> mpFillAttr;
+ std::unique_ptr<SfxItemSet> mpTextAttr;
SdrModel* mpModel;
SdrLayerID mnLayer;
Color maOldLineColor;
@@ -159,7 +163,6 @@ public:
SdrModel& rModel,
SdrLayerID nLay,
const tools::Rectangle& rRect);
- ~ImpSdrGDIMetaFileImport();
size_t DoImport(
const GDIMetaFile& rMtf,