Get rid of DECLARE_STL_STDKEY_SET

Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d

24 files changed, 74 insertions, 22 deletions

diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 83591f77b6ed..f281ecadd112 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <set>
 
 #include "documentenumeration.hxx"
 
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index f77eefca4b3e..98dde62d2947 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -37,6 +37,7 @@
 #include <o3tl/compat_functional.hxx>
 
 #include <iterator>
+#include <set>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index b5d578e380c0..f38e86138f2b 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -83,6 +83,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <set>
 
 using namespace ::comphelper;
 using namespace ::com::sun::star::uno;
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"
 
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx
index 0af46d175dff..435ef5ad77a6 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -20,6 +20,10 @@
 #ifndef EXTENSIONS_ABP_ABPTYPES_HXX
 #define EXTENSIONS_ABP_ABPTYPES_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <comphelper/stl_types.hxx>
 #include <rtl/ustring.hxx>
 
@@ -28,7 +32,7 @@ namespace abp
 {
 //.........................................................................
 
-    DECLARE_STL_STDKEY_SET( OUString, StringBag );
+    typedef std::set<OUString> StringBag;
 
     DECLARE_STL_USTRINGACCESS_MAP( OUString, MapString2String );
 
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index f9b0415b7d79..65d97ffc2240 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -213,7 +213,7 @@ namespace abp
     OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName)
     {
         OUString sCheck( _rDataSourceName );
-        ConstStringBagIterator aPos = m_pImpl->aDataSourceNames.find( sCheck );
+        StringBag::const_iterator aPos = m_pImpl->aDataSourceNames.find( sCheck );
 
         sal_Int32 nPostFix = 1;
         while ( ( m_pImpl->aDataSourceNames.end() != aPos ) && ( nPostFix < 65535 ) )
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index c2f1a940da90..724cbd5571f8 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -72,7 +72,7 @@ namespace abp
             // this page should never bother the user if there is 1 or less tables.
 
         // fill the list
-        for (   ConstStringBagIterator aTables = aTableNames.begin();
+        for (   StringBag::const_iterator aTables = aTableNames.begin();
                 aTables != aTableNames.end();
                 ++aTables
             )
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index 3b99d4c7aabf..1b409b3a98a6 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -20,6 +20,10 @@
 #ifndef _EXTENSIONS_DBP_DBPTYPES_HXX_
 #define _EXTENSIONS_DBP_DBPTYPES_HXX_
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <comphelper/stl_types.hxx>
 
 //.........................................................................
@@ -28,7 +32,7 @@ namespace dbp
 //.........................................................................
 
     DECLARE_STL_VECTOR( OUString, StringArray );
-    DECLARE_STL_STDKEY_SET( OUString, StringBag );
+    typedef std::set<OUString> StringBag;
     DECLARE_STL_STDKEY_MAP( sal_uInt32, OUString, MapInt2String );
 
 //.........................................................................
diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx
index b200e89559af..e042a5f6abae 100644
--- a/filter/source/svg/svgfontexport.hxx
+++ b/filter/source/svg/svgfontexport.hxx
@@ -20,9 +20,15 @@
 #ifndef INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
 #define INCLUDED_FILTER_SOURCE_SVG_SVGFONTEXPORT_HXX
 
-#include <comphelper/stl_types.hxx>
-#include <tools/fontenum.hxx>
+#include <sal/config.h>
+
+#include <functional>
+#include <map>
+#include <set>
+#include <vector>
 
+#include <rtl/ustring.hxx>
+#include <tools/fontenum.hxx>
 
 // -----------------
 // - SVGFontExport -
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 6da8d9942367..9d129c2ab21c 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -25,7 +25,6 @@
 #include <map>
 
 #include <stack>
-#include <set>
 
 #include <math.h>
 #include <functional>
@@ -260,10 +259,6 @@ OutputIter intersperse(
 #define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname)                 \
     DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname)   \
 
-#define DECLARE_STL_STDKEY_SET(valuetype, classname)    \
-    typedef ::std::set< valuetype > classname;          \
-    DECLARE_STL_ITERATORS(classname)                    \
-
 #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index 7286bfc513e9..a07d024904fa 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <cstddef>
+#include <set>
 
 #include <comphelper/stl_types.hxx>
 #include <rtl/textenc.h>
@@ -55,7 +56,7 @@ namespace dbtools
     class OOO_DLLPUBLIC_DBTOOLS OCharsetMap
     {
     protected:
-        DECLARE_STL_STDKEY_SET( rtl_TextEncoding, TextEncBag );
+        typedef std::set<rtl_TextEncoding> TextEncBag;
 
         TextEncBag  m_aEncodings;
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index b30529800971..b2e3bafe305d 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -21,6 +21,9 @@
 #define INCLUDED_XMLOFF_XMLIMP_HXX
 
 #include <sal/config.h>
+
+#include <set>
+
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index e2c9a84e412a..927b3e6ba988 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <comphelper/stl_types.hxx>
 #include <svtools/transfer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 8a5c4fbb8ff8..613bf2aed9df 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -26,8 +26,8 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <comphelper/stl_types.hxx>
 
+#include <set>
 #include <vector>
 
 class Rectangle;
@@ -59,7 +59,7 @@ enum XmlPlaceholder
     XmlPlaceholderVerticalOutline
 };
 
-DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap );
+typedef std::set<sal_Int32> SdXMLFormatMap;
 
 struct HeaderFooterPageSettingsImpl
 {
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 5d4e635fb33a..ed6c47155b52 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1331,7 +1331,7 @@ namespace xmloff
                 ++pValues;
             }
 
-            Int16SetIterator aSelectedPos = aSelection.find(i);
+            Int16Set::iterator aSelectedPos = aSelection.find(i);
             if (aSelection.end() != aSelectedPos)
             {   // the item at this position is selected
                 AddAttribute(
@@ -1342,7 +1342,7 @@ namespace xmloff
                 aSelection.erase(aSelectedPos);
             }
 
-            Int16SetIterator aDefaultSelectedPos = aDefaultSelection.find(i);
+            Int16Set::iterator aDefaultSelectedPos = aDefaultSelection.find(i);
             if (aDefaultSelection.end() != aDefaultSelectedPos)
             {   // the item at this position is selected as default
                 AddAttribute(
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 6b89f9d30430..c57c5fa37755 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTEXPORT_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -83,7 +87,7 @@ namespace xmloff
                 ,public OElementExport
     {
     protected:
-        DECLARE_STL_STDKEY_SET(sal_Int16, Int16Set);
+        typedef std::set<sal_Int16> Int16Set;
             // used below
 
         OUString         m_sControlId;           // the control id to use when exporting
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 62d41115d7c3..2089d3ba4b91 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_LAYEREXPORT_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 230d4f0ba540..3943af21cc23 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -108,7 +108,7 @@ namespace xmloff
             OUString sValue;
 
             // loop through all the properties which are yet to be exported
-            for (   ConstStringSetIterator  aProperty = m_aRemainingProps.begin();
+            for (   StringSet::const_iterator aProperty = m_aRemainingProps.begin();
                     aProperty != m_aRemainingProps.end();
                     ++aProperty
                 )
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index ea950b573b1e..ce294c8a9144 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYEXPORT_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include "formattributes.hxx"
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -54,7 +58,7 @@ namespace xmloff
     class OPropertyExport
     {
     private:
-        DECLARE_STL_STDKEY_SET(OUString, StringSet);
+        typedef std::set<OUString> StringSet;
         StringSet       m_aRemainingProps;
             // see examinePersistence
 
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 83d70e3fc25e..ee7b6a46802b 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_PROPERTYIMPORT_HXX
 
+#include <sal/config.h>
+
+#include <set>
+
 #include <xmloff/xmlictxt.hxx>
 #include "formattributes.hxx"
 #include <rtl/ref.hxx>
@@ -68,7 +72,7 @@ namespace xmloff
         PropertyValueArray          m_aGenericValues;
             // the values which the instance collects between StartElement and EndElement
 
-        DECLARE_STL_STDKEY_SET( OUString, StringSet );
+        typedef std::set<OUString> StringSet;
         StringSet                   m_aEncounteredAttributes;
 
         OFormLayerXMLImport_Impl&       m_rContext;