Kaydet (Commit) 2e0cea44 authored tarafından David Tardon's avatar David Tardon

use std::unique_ptr

Change-Id: I8ebbb94ae5f77fa44f46fb771f7d8ad5fc89a5bc
üst 109ea475
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
#include <sax/tools/converter.hxx> #include <sax/tools/converter.hxx>
#include <list> #include <list>
#include <o3tl/make_unique.hxx>
#include <xmloff/xmltypes.hxx> #include <xmloff/xmltypes.hxx>
#include "sdpropls.hxx" #include "sdpropls.hxx"
#include <xmloff/xmltoken.hxx> #include <xmloff/xmltoken.hxx>
...@@ -106,12 +109,11 @@ class AnimationsImportHelperImpl ...@@ -106,12 +109,11 @@ class AnimationsImportHelperImpl
private: private:
SvXMLImport& mrImport; SvXMLImport& mrImport;
SvXMLTokenMap* mpAnimationNodeTokenMap; std::unique_ptr<SvXMLTokenMap> mpAnimationNodeTokenMap;
SvXMLTokenMap* mpAnimationNodeAttributeTokenMap; std::unique_ptr<SvXMLTokenMap> mpAnimationNodeAttributeTokenMap;
public: public:
explicit AnimationsImportHelperImpl( SvXMLImport& rImport ); explicit AnimationsImportHelperImpl( SvXMLImport& rImport );
~AnimationsImportHelperImpl();
const SvXMLTokenMap& getAnimationNodeTokenMap(); const SvXMLTokenMap& getAnimationNodeTokenMap();
const SvXMLTokenMap& getAnimationNodeAttributeTokenMap(); const SvXMLTokenMap& getAnimationNodeAttributeTokenMap();
...@@ -127,16 +129,8 @@ public: ...@@ -127,16 +129,8 @@ public:
}; };
AnimationsImportHelperImpl::AnimationsImportHelperImpl( SvXMLImport& rImport ) AnimationsImportHelperImpl::AnimationsImportHelperImpl( SvXMLImport& rImport )
: mrImport( rImport ), : mrImport( rImport )
mpAnimationNodeTokenMap( nullptr ),
mpAnimationNodeAttributeTokenMap( nullptr )
{
}
AnimationsImportHelperImpl::~AnimationsImportHelperImpl()
{ {
delete mpAnimationNodeTokenMap;
delete mpAnimationNodeAttributeTokenMap;
} }
const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap() const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
...@@ -159,7 +153,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap() ...@@ -159,7 +153,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
mpAnimationNodeTokenMap = new SvXMLTokenMap( aAnimationNodeTokenMap ); mpAnimationNodeTokenMap = o3tl::make_unique<SvXMLTokenMap>( aAnimationNodeTokenMap );
} }
return *mpAnimationNodeTokenMap; return *mpAnimationNodeTokenMap;
...@@ -278,7 +272,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM ...@@ -278,7 +272,7 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };
mpAnimationNodeAttributeTokenMap = new SvXMLTokenMap( aAnimationNodeAttributeTokenMap ); mpAnimationNodeAttributeTokenMap = o3tl::make_unique<SvXMLTokenMap>( aAnimationNodeAttributeTokenMap );
} }
return *mpAnimationNodeAttributeTokenMap; return *mpAnimationNodeAttributeTokenMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment