use std::unique_ptr

Change-Id: I94aafd665116d01d2f6134c4b41ab70c34e23ab6

2 files changed, 26 insertions, 53 deletions

diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index 0e513e076c82..a842fd470560 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
 #define INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
 
+#include <memory>
+
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/families.hxx>
 #include <com/sun/star/util/XStringMapping.hpp>
@@ -66,23 +68,22 @@ private:
     css::uno::Reference< css::chart::XChartDocument > mxChartDoc;
     SvXMLStylesContext* mpAutoStyles;
 
-    SvXMLTokenMap* mpChartDocElemTokenMap;
-    SvXMLTokenMap* mpTableElemTokenMap;
-    SvXMLTokenMap* mpChartElemTokenMap;
-    SvXMLTokenMap* mpPlotAreaElemTokenMap;
-    SvXMLTokenMap* mpSeriesElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpChartDocElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpTableElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpChartElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpPlotAreaElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpSeriesElemTokenMap;
 
-    SvXMLTokenMap* mpChartAttrTokenMap;
-    SvXMLTokenMap* mpPlotAreaAttrTokenMap;
-    SvXMLTokenMap* mpCellAttrTokenMap;
-    SvXMLTokenMap* mpSeriesAttrTokenMap;
-    SvXMLTokenMap* mpPropMappingAttrTokenMap;
-    SvXMLTokenMap* mpRegEquationAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpChartAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpPlotAreaAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpCellAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpSeriesAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpPropMappingAttrTokenMap;
+    std::unique_ptr<SvXMLTokenMap> mpRegEquationAttrTokenMap;
 
 public:
 
     SchXMLImportHelper();
-    virtual ~SchXMLImportHelper();
 
     /** get the context for reading the <chart:chart> element with subelements.
         The result is stored in the XModel given if it also implements
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 17645c9896be..373efbec0cc5 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -24,6 +24,7 @@
 #include "SchXMLTools.hxx"
 #include "facreg.hxx"
 
+#include <o3tl/make_unique.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/processfactory.hxx>
 #include <xmloff/nmspmap.hxx>
@@ -85,37 +86,8 @@ private:
 // attribute maps
 
 SchXMLImportHelper::SchXMLImportHelper() :
-        mpAutoStyles( nullptr ),
-
-        mpChartDocElemTokenMap( nullptr ),
-        mpTableElemTokenMap( nullptr ),
-        mpChartElemTokenMap( nullptr ),
-        mpPlotAreaElemTokenMap( nullptr ),
-        mpSeriesElemTokenMap( nullptr ),
-
-        mpChartAttrTokenMap( nullptr ),
-        mpPlotAreaAttrTokenMap( nullptr ),
-        mpCellAttrTokenMap( nullptr ),
-        mpSeriesAttrTokenMap( nullptr ),
-        mpPropMappingAttrTokenMap( nullptr ),
-        mpRegEquationAttrTokenMap( nullptr )
-{
-}
-
-SchXMLImportHelper::~SchXMLImportHelper()
+        mpAutoStyles( nullptr )
 {
-    // delete token maps
-    delete mpChartDocElemTokenMap;
-    delete mpTableElemTokenMap;
-    delete mpChartElemTokenMap;
-    delete mpPlotAreaElemTokenMap;
-    delete mpSeriesElemTokenMap;
-
-    delete mpChartAttrTokenMap;
-    delete mpPlotAreaAttrTokenMap;
-    delete mpCellAttrTokenMap;
-    delete mpSeriesAttrTokenMap;
-    delete mpPropMappingAttrTokenMap;
 }
 
 SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
@@ -171,7 +143,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
             XML_TOKEN_MAP_END
         };
 
-        mpChartDocElemTokenMap = new SvXMLTokenMap( aDocElemTokenMap );
+        mpChartDocElemTokenMap = o3tl::make_unique<SvXMLTokenMap>( aDocElemTokenMap );
     } // if( ! mpChartDocElemTokenMap )
 
     return *mpChartDocElemTokenMap;
@@ -192,7 +164,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap()
         XML_TOKEN_MAP_END
     };
 
-        mpTableElemTokenMap = new SvXMLTokenMap( aTableElemTokenMap );
+        mpTableElemTokenMap = o3tl::make_unique<SvXMLTokenMap>( aTableElemTokenMap );
     } // if( ! mpTableElemTokenMap )
 
     return *mpTableElemTokenMap;
@@ -212,7 +184,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap()
             XML_TOKEN_MAP_END
         };
 
-        mpChartElemTokenMap = new SvXMLTokenMap( aChartElemTokenMap );
+        mpChartElemTokenMap = o3tl::make_unique<SvXMLTokenMap>( aChartElemTokenMap );
     } // if( ! mpChartElemTokenMap )
 
     return *mpChartElemTokenMap;
@@ -237,7 +209,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpPlotAreaElemTokenMap = new SvXMLTokenMap( aPlotAreaElemTokenMap );
+        mpPlotAreaElemTokenMap = o3tl::make_unique<SvXMLTokenMap>( aPlotAreaElemTokenMap );
     } // if( ! mpPlotAreaElemTokenMap )
 
     return *mpPlotAreaElemTokenMap;
@@ -258,7 +230,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpSeriesElemTokenMap = new SvXMLTokenMap( aSeriesElemTokenMap );
+        mpSeriesElemTokenMap = o3tl::make_unique<SvXMLTokenMap>( aSeriesElemTokenMap );
     } // if( ! mpSeriesElemTokenMap )
 
     return *mpSeriesElemTokenMap;
@@ -280,7 +252,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpChartAttrTokenMap = new SvXMLTokenMap( aChartAttrTokenMap );
+        mpChartAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aChartAttrTokenMap );
     } // if( ! mpChartAttrTokenMap )
 
     return *mpChartAttrTokenMap;
@@ -313,7 +285,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpPlotAreaAttrTokenMap = new SvXMLTokenMap( aPlotAreaAttrTokenMap );
+        mpPlotAreaAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aPlotAreaAttrTokenMap );
     } // if( ! mpPlotAreaAttrTokenMap )
 
     return *mpPlotAreaAttrTokenMap;
@@ -330,7 +302,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpCellAttrTokenMap = new SvXMLTokenMap( aCellAttrTokenMap );
+        mpCellAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aCellAttrTokenMap );
     } // if( ! mpCellAttrTokenMap )
 
     return *mpCellAttrTokenMap;
@@ -351,7 +323,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpSeriesAttrTokenMap = new SvXMLTokenMap( aSeriesAttrTokenMap );
+        mpSeriesAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aSeriesAttrTokenMap );
     } // if( ! mpSeriesAttrTokenMap )
 
     return *mpSeriesAttrTokenMap;
@@ -368,7 +340,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPropMappingAttrTokenMap()
             XML_TOKEN_MAP_END
         };
 
-        mpPropMappingAttrTokenMap = new SvXMLTokenMap( aPropMappingAttrTokenMap );
+        mpPropMappingAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aPropMappingAttrTokenMap );
     }
 
     return *mpPropMappingAttrTokenMap;
@@ -388,7 +360,7 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
     XML_TOKEN_MAP_END
 };
 
-        mpRegEquationAttrTokenMap = new SvXMLTokenMap( aRegressionEquationAttrTokenMap );
+        mpRegEquationAttrTokenMap = o3tl::make_unique<SvXMLTokenMap>( aRegressionEquationAttrTokenMap );
     } // if( ! mpRegEquationAttrTokenMap )
 
     return *mpRegEquationAttrTokenMap;