diff options
| -rw-r--r-- | xmloff/inc/XMLEventImportHelper.hxx | 5 | ||||
| -rw-r--r-- | xmloff/source/script/XMLEventImportHelper.cxx | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx index 0ad45da644ca..99d03999ec25 100644 --- a/xmloff/inc/XMLEventImportHelper.hxx +++ b/xmloff/inc/XMLEventImportHelper.hxx @@ -25,6 +25,7 @@ #include <map> #include <vector> +#include <memory> namespace com { namespace sun { namespace star { @@ -57,10 +58,10 @@ class XMLEventImportHelper FactoryMap aFactoryMap; /// map from XML to API names - NameMap* pEventNameMap; + std::unique_ptr<NameMap> pEventNameMap; /// stack of previous aEventNameMap - std::vector< NameMap* > aEventNameMapVector; + std::vector< std::unique_ptr<NameMap> > aEventNameMapVector; public: XMLEventImportHelper(); diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx index 84bcd8eb1d16..0e45525856af 100644 --- a/xmloff/source/script/XMLEventImportHelper.cxx +++ b/xmloff/source/script/XMLEventImportHelper.cxx @@ -50,7 +50,7 @@ XMLEventImportHelper::~XMLEventImportHelper() aFactoryMap.clear(); // delete name map - delete pEventNameMap; + pEventNameMap.reset(); } void XMLEventImportHelper::RegisterFactory( @@ -91,8 +91,8 @@ void XMLEventImportHelper::AddTranslationTable( void XMLEventImportHelper::PushTranslationTable() { // save old map and install new one - aEventNameMapVector.push_back(pEventNameMap); - pEventNameMap = new NameMap; + aEventNameMapVector.push_back(std::move(pEventNameMap)); + pEventNameMap.reset( new NameMap ); } void XMLEventImportHelper::PopTranslationTable() @@ -102,8 +102,7 @@ void XMLEventImportHelper::PopTranslationTable() if ( !aEventNameMapVector.empty() ) { // delete current and install old map - delete pEventNameMap; - pEventNameMap = aEventNameMapVector.back(); + pEventNameMap = std::move(aEventNameMapVector.back()); aEventNameMapVector.pop_back(); } } |