Get rid of DECLARE_STL_STDKEY_SET

Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d

7 files changed, 24 insertions, 8 deletions

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;