diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-17 09:39:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-20 15:15:58 +0200 |
| commit | 35e1658e7275777ee94902b5014fd93b8daf975c (patch) | |
| tree | f9ee60c44eb4adf0e16a35d9cfcb499890f7cf2e /xmloff | |
| parent | 3c658d7fd77eb2e7b98e70c6b8fd5f80cb6414f7 (diff) | |
loplugin:useuniqueptr in XMLEventExport
Change-Id: I29a7c565db576afa4dbd0e0fbd1dfd99f9c989fc
Reviewed-on: https://gerrit.libreoffice.org/60618
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlexp.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/script/XMLEventExport.cxx | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index fc30db7b8bb2..c3b82f214246 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -95,6 +95,7 @@ #include <comphelper/xmltools.hxx> #include <comphelper/graphicmimetype.hxx> +#include <o3tl/make_unique.hxx> using namespace ::osl; using namespace ::com::sun::star; @@ -2010,8 +2011,8 @@ XMLEventExport& SvXMLExport::GetEventExport() mpEventExport.reset( new XMLEventExport(*this) ); // and register standard handlers + names - mpEventExport->AddHandler("StarBasic", new XMLStarBasicExportHandler()); - mpEventExport->AddHandler("Script", new XMLScriptExportHandler()); + mpEventExport->AddHandler("StarBasic", o3tl::make_unique<XMLStarBasicExportHandler>()); + mpEventExport->AddHandler("Script", o3tl::make_unique<XMLScriptExportHandler>()); mpEventExport->AddTranslationTable(aStandardEventTable); } diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 64e47a45919c..72d550527bd1 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -52,21 +52,14 @@ XMLEventExport::XMLEventExport(SvXMLExport& rExp) : XMLEventExport::~XMLEventExport() { // delete all handlers - for( auto& rEntry : aHandlerMap ) - { - delete rEntry.second; - } aHandlerMap.clear(); } void XMLEventExport::AddHandler( const OUString& rName, - XMLEventExportHandler* pHandler ) + std::unique_ptr<XMLEventExportHandler> pHandler ) { - DBG_ASSERT(pHandler != nullptr, "Need EventExportHandler"); - if (pHandler != nullptr) - { - aHandlerMap[rName] = pHandler; - } + assert(pHandler); + aHandlerMap[rName] = std::move(pHandler); } void XMLEventExport::AddTranslationTable( |