Kill comphelper::MakeMap

Change-Id: I97e9e79ef51e3d78f01b831dd3eee91218058823
Reviewed-on: https://gerrit.libreoffice.org/24344
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 25 insertions, 38 deletions

diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 2618566014d1..34b1a3e6b3b5 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -20,7 +20,6 @@
 #include "SchXMLTools.hxx"
 
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/InlineContainer.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmlimppr.hxx>
@@ -48,6 +47,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <algorithm>
+#include <map>
 
 using namespace com::sun::star;
 using namespace ::xmloff::token;
@@ -153,47 +153,34 @@ SchXMLChartTypeEnum GetChartTypeEnum( const OUString& rClassName )
     return SchXMLChartTypeEnum(nEnumVal);
 }
 
-typedef ::comphelper::MakeMap< OUString, OUString > tMakeStringStringMap;
+typedef std::map< OUString, OUString > tMakeStringStringMap;
 //static
 const tMakeStringStringMap& lcl_getChartTypeNameMap()
 {
     //shape property -- chart model object property
-    static const tMakeStringStringMap g_aChartTypeNameMap =
-        tMakeStringStringMap
-        ( OUString( "com.sun.star.chart.LineDiagram" )
-        , OUString( "com.sun.star.chart2.LineChartType" ) )
-
-        ( OUString( "com.sun.star.chart.AreaDiagram" )
-        , OUString( "com.sun.star.chart2.AreaChartType" ) )
-
-        ( OUString( "com.sun.star.chart.BarDiagram" )
-        , OUString( "com.sun.star.chart2.ColumnChartType" ) )
-
-        ( OUString( "com.sun.star.chart.PieDiagram" )
-        , OUString( "com.sun.star.chart2.PieChartType" ) )
-
-        ( OUString( "com.sun.star.chart.DonutDiagram" )
-        , OUString( "com.sun.star.chart2.DonutChartType" ) )
-
-        ( OUString( "com.sun.star.chart.XYDiagram" )
-        , OUString( "com.sun.star.chart2.ScatterChartType" ) )
-
-        ( OUString( "com.sun.star.chart.NetDiagram" )
-        , OUString( "com.sun.star.chart2.NetChartType" ) )
-
-        ( OUString( "com.sun.star.chart.FilledNetDiagram" )
-        , OUString( "com.sun.star.chart2.FilledNetChartType" ) )
-
-        ( OUString( "com.sun.star.chart.StockDiagram" )
-        , OUString( "com.sun.star.chart2.CandleStickChartType" ) )
-
-        ( OUString( "com.sun.star.chart.BubbleDiagram" )
-        , OUString( "com.sun.star.chart2.BubbleChartType" ) )
-
-        ( OUString( "com.sun.star.chart.GL3DBarDiagram" )
-        , OUString( "com.sun.star.chart2.GL3DBarChartType" ) )
-
-        ;
+    static const tMakeStringStringMap g_aChartTypeNameMap{
+        {"com.sun.star.chart.LineDiagram",
+         "com.sun.star.chart2.LineChartType"},
+        {"com.sun.star.chart.AreaDiagram",
+         "com.sun.star.chart2.AreaChartType"},
+        {"com.sun.star.chart.BarDiagram",
+         "com.sun.star.chart2.ColumnChartType"},
+        {"com.sun.star.chart.PieDiagram",
+         "com.sun.star.chart2.PieChartType"},
+        {"com.sun.star.chart.DonutDiagram",
+         "com.sun.star.chart2.DonutChartType"},
+        {"com.sun.star.chart.XYDiagram",
+         "com.sun.star.chart2.ScatterChartType"},
+        {"com.sun.star.chart.NetDiagram",
+         "com.sun.star.chart2.NetChartType"},
+        {"com.sun.star.chart.FilledNetDiagram",
+         "com.sun.star.chart2.FilledNetChartType"},
+        {"com.sun.star.chart.StockDiagram",
+         "com.sun.star.chart2.CandleStickChartType"},
+        {"com.sun.star.chart.BubbleDiagram",
+         "com.sun.star.chart2.BubbleChartType"},
+        {"com.sun.star.chart.GL3DBarDiagram",
+         "com.sun.star.chart2.GL3DBarChartType"}};
     return g_aChartTypeNameMap;
 }