return unique_ptr in OXMLHelper

Change-Id: Iad6e51ef1b7b8d4ab1227b89f77a3d72d3424bcd
Reviewed-on: https://gerrit.libreoffice.org/69857
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

reportdesign/source/filter/xml/xmlHelper.cxx

@@ -332,7 +332,7 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
     return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
 }
 
-SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
+std::unique_ptr<SvXMLTokenMap> OXMLHelper::GetReportElemTokenMap()
 {
     static const SvXMLTokenMapEntry aElemTokenMap[]=
     {
@@ -357,10 +357,10 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
         { XML_NAMESPACE_OFFICE, XML_BODY,                       XML_TOK_SUB_BODY },
         XML_TOKEN_MAP_END
     };
-    return new SvXMLTokenMap( aElemTokenMap );
+    return std::make_unique<SvXMLTokenMap>( aElemTokenMap );
 }
 
-SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
+std::unique_ptr<SvXMLTokenMap> OXMLHelper::GetSubDocumentElemTokenMap()
 {
     static const SvXMLTokenMapEntry aElemTokenMap[]=
     {
@@ -369,7 +369,7 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
         { XML_NAMESPACE_REPORT, XML_DETAIL,                 XML_TOK_SUB_DETAIL},
         XML_TOKEN_MAP_END
     };
-    return new SvXMLTokenMap( aElemTokenMap );
+    return std::make_unique<SvXMLTokenMap>( aElemTokenMap );
 }
 
 const SvXMLEnumMapEntry<sal_Int16>* OXMLHelper::GetImageScaleOptions()

reportdesign/source/filter/xml/xmlHelper.hxx

@@ -63,8 +63,8 @@ namespace rptxml
         static void copyStyleElements(const bool _bOld,const OUString& _sStyleName,const SvXMLStylesContext* _pAutoStyles,const css::uno::Reference< css::beans::XPropertySet>& _xProp);
         static css::uno::Reference< css::beans::XPropertySet> createBorderPropertySet();
 
-        static SvXMLTokenMap* GetReportElemTokenMap();
-        static SvXMLTokenMap* GetSubDocumentElemTokenMap();
+        static std::unique_ptr<SvXMLTokenMap> GetReportElemTokenMap();
+        static std::unique_ptr<SvXMLTokenMap> GetSubDocumentElemTokenMap();
 
     };
 

reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx

@@ -372,7 +372,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
     // set ourself as delegator
     m_xProxy->setDelegator( *this );
 
-    m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
+    m_pReportElemTokenMap = OXMLHelper::GetReportElemTokenMap();
 }
 
 uno::Any SAL_CALL ImportDocumentHandler::queryInterface( const uno::Type& _rType )

reportdesign/source/filter/xml/xmlfilter.cxx

@@ -810,14 +810,14 @@ const SvXMLTokenMap& ORptFilter::GetDocContentElemTokenMap() const
 const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const
 {
     if (!m_pReportElemTokenMap)
-        m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
+        m_pReportElemTokenMap = OXMLHelper::GetReportElemTokenMap();
     return *m_pReportElemTokenMap;
 }
 
 const SvXMLTokenMap& ORptFilter::GetSubDocumentElemTokenMap() const
 {
     if (!m_pSubDocumentElemTokenMap)
-        m_pSubDocumentElemTokenMap.reset(OXMLHelper::GetSubDocumentElemTokenMap());
+        m_pSubDocumentElemTokenMap = OXMLHelper::GetSubDocumentElemTokenMap();
     return *m_pSubDocumentElemTokenMap;
 }