7 files changed, 25 insertions, 16 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 724def0244bb..e72848531f9d 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -496,7 +496,7 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
     OUString aName;
     OUString aValue;
 
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
@@ -557,7 +557,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
 
 
     // Aggregate Liste to OUString
-    for (   HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin();
+    for (   HtmlSuccessfulObjList::iterator pSuccObj = aSuccObjList.begin();
             pSuccObj < aSuccObjList.end();
             ++pSuccObj
         )
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index cbd685c3e416..934c9ef490b1 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_DATABASEFORM_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "propertybaghelper.hxx"
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/XSQLErrorListener.hpp>
@@ -111,8 +115,7 @@ public:
     }
 };
 
-
-DECLARE_STL_VECTOR(HtmlSuccessfulObj, HtmlSuccessfulObjList);
+typedef std::vector<HtmlSuccessfulObj> HtmlSuccessfulObjList;
 
 //========================================================================
 class OGroupManager;
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 0d34521a8a6b..b17c47ca55f1 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 #define INCLUDED_FORMS_SOURCE_COMPONENT_EVENTTHREAD_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -29,7 +33,6 @@
 
 #include <osl/conditn.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/uno3.hxx>
 using namespace comphelper;
 
@@ -47,9 +50,9 @@ class OComponentEventThread
             ,public ::com::sun::star::lang::XEventListener
             ,public ::cppu::OWeakObject
 {
-    DECLARE_STL_VECTOR(::com::sun::star::lang::EventObject*, ThreadEvents);
-    DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> , ThreadObjects);
-    DECLARE_STL_VECTOR(sal_Bool,    ThreadBools);
+    typedef std::vector<css::lang::EventObject*> ThreadEvents;
+    typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> > ThreadObjects;
+    typedef std::vector<sal_Bool> ThreadBools;
 
     ::osl::Mutex                    m_aMutex;
     ::osl::Condition                m_aCond;            // Queue filled?
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 926c0cf34e79..19b6abb1640c 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -246,7 +246,7 @@ Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
     Sequence<Reference<XControlModel> > aControlModelSeq( nLen );
     Reference<XControlModel>* pModels = aControlModelSeq.getArray();
 
-    ConstOGroupCompArrIterator aGroupComps = m_aCompArray.begin();
+    OGroupCompArr::const_iterator aGroupComps = m_aCompArray.begin();
     for (sal_Int32 i = 0; i < nLen; ++i, ++pModels, ++aGroupComps)
     {
         *pModels = aGroupComps->GetControlModel();
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index 05f0936c2c69..c0b40094f98e 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -27,11 +27,11 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
 
 #include <algorithm>
 #include <map>
+#include <vector>
 
 using namespace comphelper;
 
@@ -120,7 +120,7 @@ public:
     OUString GetName() const { return m_aName; }
 };
 
-DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr);
+typedef std::vector<OGroupComp> OGroupCompArr;
 
 //========================================================================
 class OGroupComp;
@@ -141,7 +141,7 @@ public:
     const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
 };
 
-DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr);
+typedef std::vector<OGroupCompAcc> OGroupCompAccArr;
 
 //========================================================================
 class OGroup
@@ -174,7 +174,7 @@ public:
 };
 
 typedef std::map<OUString, OGroup> OGroupArr;
-DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups);
+typedef std::vector<OGroupArr::iterator> OActiveGroups;
 
 //========================================================================
 class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener>
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 8bf420c4d3d0..93e62e0d7714 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 #define INCLUDED_FORMS_SOURCE_INC_PROPERTY_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -27,7 +31,6 @@
 #include <cppuhelper/proptypehlp.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/propagg.hxx>
-#include <comphelper/stl_types.hxx>
 
 using namespace comphelper;
 
@@ -61,7 +64,7 @@ class PropertyInfoService
 
     };
 
-    DECLARE_STL_VECTOR(PropertyAssignment, PropertyMap);
+    typedef std::vector<PropertyAssignment> PropertyMap;
     static PropertyMap      s_AllKnownProperties;
 
     //..................................................................
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 63da1d549fb9..476c16425c5f 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -42,7 +42,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
 
     PropertyAssignment aCompareName(_rName, -1);
 
-    ::std::pair<PropertyMapIterator,PropertyMapIterator> aPair = ::std::equal_range(
+    ::std::pair<PropertyMap::iterator,PropertyMap::iterator> aPair = ::std::equal_range(
         s_AllKnownProperties.begin(),
         s_AllKnownProperties.end(),
         aCompareName,