Get rid of DECLARE_STL_USTRINGACCESS_MAP

Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c

5 files changed, 20 insertions, 12 deletions

diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index f633259f631b..860e9025c40a 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -20,10 +20,13 @@
 #ifndef _REPORT_RPTUIDEF_HXX
 #define _REPORT_RPTUIDEF_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "dllapi.h"
 #include <tools/solar.h>
 #include <svx/svdobj.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 #include <svx/fmglob.hxx>
 #include <boost/shared_ptr.hpp>
@@ -92,7 +95,7 @@ public:
 */
 REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
 typedef ::std::pair< OUString, ::boost::shared_ptr<AnyConverter> > TPropertyConverter;
-DECLARE_STL_USTRINGACCESS_MAP(TPropertyConverter , TPropertyNamePair);
+typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
 /** returns the property name map for the givern property id
     @param  _nObjectId  the object id
 */
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index b31940d074ab..c41078481024 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -37,9 +37,9 @@
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <map>
 #include <memory>
 #include <boost/shared_ptr.hpp>
 #include <xmloff/prhdlfac.hxx>
@@ -68,8 +68,8 @@ using namespace ::com::sun::star::xml::sax;
 class ORptFilter : public SvXMLImport
 {
 public:
-    DECLARE_STL_USTRINGACCESS_MAP(Sequence<PropertyValue>,TPropertyNameMap);
-    DECLARE_STL_USTRINGACCESS_MAP( Reference<XFunction> ,TGroupFunctionMap);
+    typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap;
+    typedef std::map< OUString, Reference<XFunction> > TGroupFunctionMap;
 private:
 
     TGroupFunctionMap                               m_aFunctions;
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index bb9cb8531d05..2aba9c75a890 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -24,10 +24,9 @@
 #include <com/sun/star/report/meta/XFunctionManager.hpp>
 #include <com/sun/star/report/meta/XFunctionCategory.hpp>
 #include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <map>
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <comphelper/stl_types.hxx>
-
 
 namespace rptui
 {
@@ -37,8 +36,8 @@ class FunctionDescription;
 //============================================================================
 class FunctionManager : public formula::IFunctionManager
 {
-    DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionDescription >,  TFunctionsMap);
-    DECLARE_STL_USTRINGACCESS_MAP( ::boost::shared_ptr< FunctionCategory > ,    TCategoriesMap);
+    typedef std::map< OUString, ::boost::shared_ptr< FunctionDescription > > TFunctionsMap;
+    typedef std::map< OUString, ::boost::shared_ptr< FunctionCategory > > TCategoriesMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionManager> m_xMgr;
     mutable TCategoriesMap  m_aCategories;
     mutable ::std::vector< TCategoriesMap::iterator > m_aCategoryIndex;
diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx
index b58aea237dec..da962468ad7a 100644
--- a/reportdesign/source/ui/inc/toolboxcontroller.hxx
+++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx
@@ -19,8 +19,11 @@
 #ifndef RPTUI_TOOLBOXCONTROLLER_HXX
 #define RPTUI_TOOLBOXCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <svtools/toolboxcontroller.hxx>
-#include <comphelper/stl_types.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XSubToolbarController.hpp>
@@ -37,7 +40,7 @@ namespace rptui
     class OToolboxController : public ::svt::ToolboxController
                               ,public TToolboxController_BASE
     {
-        DECLARE_STL_USTRINGACCESS_MAP(sal_Bool,TCommandState);
+        typedef std::map<OUString, sal_Bool> TCommandState;
         TCommandState   m_aStates;
         TToolbarHelper  m_pToolbarController;
         sal_uInt16      m_nToolBoxId;
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index cc9890eecb9c..a9688e45073f 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <map>
 
 #include <ReportControllerObserver.hxx>
 #include <ReportController.hxx>
@@ -39,7 +42,7 @@ namespace rptui
 
     using namespace ::com::sun::star;
 
-DECLARE_STL_USTRINGACCESS_MAP(bool, AllProperties);
+typedef std::map<OUString, bool> AllProperties;
 DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, PropertySetInfoCache);
 
 class OXReportControllerObserverImpl