From 0c55303581156d01992d9d958ac5f7aafc4a3ebb Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 5 Dec 2013 17:42:08 +0100
Subject: Get rid of DECLARE_STL_STDKEY_SET

Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d
---
 dbaccess/source/core/dataaccess/datasource.cxx | 2 ++
 dbaccess/source/ui/dlg/DbAdminImpl.hxx         | 4 ++++
 dbaccess/source/ui/dlg/dsselect.cxx            | 2 +-
 dbaccess/source/ui/inc/commontypes.hxx         | 6 +++++-
 dbaccess/source/ui/inc/dsmeta.hxx              | 4 ++++
 5 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'dbaccess/source')

diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index cd349b722bc9..c2b46de3c4a0 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -67,8 +67,10 @@
 #include <unotools/confignode.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include <rtl/digest.h>
+
 #include <algorithm>
 #include <iterator>
+#include <set>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index d8b91e323e91..59bc3d2bb5a0 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index fea904bcdeac..e12703739eea 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -138,7 +138,7 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
          sSelected = m_aDatasource.GetSelectEntry();
     m_aDatasource.Clear();
     // fill the list
-    for (   ConstStringBagIterator aDS = _rDatasources.begin();
+    for (   StringBag::const_iterator aDS = _rDatasources.begin();
             aDS != _rDatasources.end();
             ++aDS
         )
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index 0292f33f1aab..e87ef1317643 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
 
@@ -32,7 +36,7 @@ namespace com { namespace sun { namespace star {
 namespace dbaui
 {
 
-    DECLARE_STL_STDKEY_SET( OUString, StringBag );
+    typedef std::set<OUString> StringBag;
     DECLARE_STL_VECTOR( sal_Int8, ByteVector );
     DECLARE_STL_VECTOR( OUString, StringArray );
 
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index f9027da2a1ae..5b1a1f4dfc39 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include "dsntypes.hxx"
 #include "dsitems.hxx"
 
-- 
cgit