From a82805f8f97eeb6acadd7806cdb7120bed45a376 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sun, 24 Apr 2016 20:11:47 +0200
Subject: 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>
---
 chart2/source/tools/ObjectIdentifier.cxx | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'chart2/source/tools/ObjectIdentifier.cxx')

diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 198d49426f20..7ef0a95891e4 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "ObjectIdentifier.hxx"
 #include "macros.hxx"
 #include "TitleHelper.hxx"
@@ -34,8 +38,6 @@
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 
-#include <comphelper/InlineContainer.hxx>
-
 #include <rtl/ustrbuf.hxx>
 
 namespace chart
@@ -92,19 +94,18 @@ OUString lcl_createClassificationStringForType( ObjectType eObjectType
     return aRet.makeStringAndClear();
 }
 
-typedef ::comphelper::MakeMap< TitleHelper::eTitleType, OUString > tTitleMap;
+typedef std::map< TitleHelper::eTitleType, OUString > tTitleMap;
 const tTitleMap& lcl_getTitleMap()
 {
     //maps the title type to the ParentParticle for that title
-    static tTitleMap s_aTitleMap = tTitleMap
-        ( TitleHelper::MAIN_TITLE, "" )
-        ( TitleHelper::SUB_TITLE, "D=0" )
-        ( TitleHelper::X_AXIS_TITLE, "D=0:CS=0:Axis=0,0" )
-        ( TitleHelper::Y_AXIS_TITLE, "D=0:CS=0:Axis=1,0" )
-        ( TitleHelper::Z_AXIS_TITLE, "D=0:CS=0:Axis=2,0" )
-        ( TitleHelper::SECONDARY_X_AXIS_TITLE, "D=0:CS=0:Axis=0,1" )
-        ( TitleHelper::SECONDARY_Y_AXIS_TITLE, "D=0:CS=0:Axis=1,1" )
-        ;
+    static tTitleMap s_aTitleMap{
+        {TitleHelper::MAIN_TITLE, ""},
+        {TitleHelper::SUB_TITLE, "D=0"},
+        {TitleHelper::X_AXIS_TITLE, "D=0:CS=0:Axis=0,0"},
+        {TitleHelper::Y_AXIS_TITLE, "D=0:CS=0:Axis=1,0"},
+        {TitleHelper::Z_AXIS_TITLE, "D=0:CS=0:Axis=2,0"},
+        {TitleHelper::SECONDARY_X_AXIS_TITLE, "D=0:CS=0:Axis=0,1"},
+        {TitleHelper::SECONDARY_Y_AXIS_TITLE, "D=0:CS=0:Axis=1,1"}};
     return s_aTitleMap;
 }
 
-- 
cgit