Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx

Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab

4 files changed, 20 insertions, 11 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 2a1ce71b4cf3..c946f666f141 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -17,6 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sal/config.h"
+
+#include <map>
+#include <utility>
+
 #include <string.h>
 #include "RowSet.hxx"
 #include "dbastrings.hrc"
@@ -1836,8 +1841,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     sal_Int32 nCount = xMetaData->getColumnCount();
                     m_aDataColumns.reserve(nCount+1);
                     aColumns->get().reserve(nCount+1);
-                    DECLARE_STL_USTRINGACCESS_MAP(int,StringMap);
-                    StringMap aColumnMap;
+                    std::map< OUString, int > aColumnMap;
                     for (sal_Int32 i = 0 ; i < nCount; ++i)
                     {
                         // retrieve the name of the column
@@ -1861,7 +1865,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                                                                             aDescription,
                                                                             OUString(),
                                                                             m_aCurrentRow);
-                        aColumnMap.insert(StringMap::value_type(sName,0));
+                        aColumnMap.insert(std::make_pair(sName,0));
                         aColumns->get().push_back(pColumn);
                         pColumn->setName(sName);
                         aNames.push_back(sName);
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 1246adbd4374..d5d5ff74e328 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sal/config.h"
+
+#include <map>
+
 #include "xmlDataSourceSetting.hxx"
 #include "xmlDataSource.hxx"
 #include <sax/tools/converter.hxx>
@@ -68,8 +72,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
             case XML_TOK_DATA_SOURCE_SETTING_TYPE:
                 {
                     // needs to be translated into a ::com::sun::star::uno::Type
-                    DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Type, MapString2Type );
-                    static MapString2Type s_aTypeNameMap;
+                    static std::map< OUString, css::uno::Type > s_aTypeNameMap;
                     if (!s_aTypeNameMap.size())
                     {
                         s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)]   = ::getBooleanCppuType();
@@ -81,7 +84,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
                         s_aTypeNameMap[GetXMLToken( XML_VOID)]      = ::getVoidCppuType();
                     }
 
-                    const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue);
+                    const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);
                     OSL_ENSURE(s_aTypeNameMap.end() != aTypePos, "OXMLDataSourceSetting::OXMLDataSourceSetting: invalid type!");
                     if (s_aTypeNameMap.end() != aTypePos)
                         m_aPropType = aTypePos->second;
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index ef2e698a06f3..49e9697f6d02 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sal/config.h"
+
+#include <set>
 
 #include "indexdialog.hxx"
 #include "dbu_dlg.hrc"
@@ -714,8 +717,7 @@ DBG_NAME(DbaIndexDialog)
         }
 
         // no double fields
-        DECLARE_STL_STDKEY_SET( String, StringBag );
-        StringBag aExistentFields;
+        std::set< String > aExistentFields;
         for (   ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
                 aFieldCheck != _rPos->aFields.end();
                 ++aFieldCheck
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 722afd354100..64fda00bcd82 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -23,6 +23,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <map>
+#include <utility>
 
 //........................................................................
 namespace dbaui
@@ -126,8 +127,7 @@ namespace dbaui
     //--------------------------------------------------------------------
     static AuthenticationMode getAuthenticationMode( const ::rtl::OUString& _sURL )
     {
-        DECLARE_STL_USTRINGACCESS_MAP( FeatureSupport, Supported);
-        static Supported s_aSupport;
+        static std::map< OUString, FeatureSupport > s_aSupport;
         if ( s_aSupport.empty() )
         {
             ::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessComponentContext());
@@ -147,7 +147,7 @@ namespace dbaui
                     else if ( sAuth == "Password" )
                         aInit = AuthPwd;
                 }
-                s_aSupport.insert(Supported::value_type(*pIter,aInit));
+                s_aSupport.insert(std::make_pair(*pIter,aInit));
             }
         }
         OSL_ENSURE(s_aSupport.find(_sURL) != s_aSupport.end(),"Illegal URL!");