Get rid of DECLARE_STL_VECTOR

Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a

4 files changed, 19 insertions, 17 deletions

diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3d6a54cffab4..cd81bf31d08b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -270,7 +270,7 @@ sal_Bool FmSearchEngine::MoveCursor()
 }
 
 //------------------------------------------------------------------------
-sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     sal_Bool bSuccess(sal_True);
     if (m_bForward)
@@ -399,13 +399,13 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // --------------------------------------------------------------
     sal_Bool bFound(sal_False);
@@ -464,13 +464,13 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     // die Startposition merken
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     WildCard aSearchExpression(strExpression);
 
@@ -542,7 +542,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
 
 //------------------------------------------------------------------------
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos,
-    FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
+    FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     DBG_ASSERT(m_bLevenshtein || m_bRegular,
         "FmSearchEngine::SearchRegularApprox : ungueltiger Suchmodus !");
@@ -553,7 +553,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
     Any aStartMark;
     try { aStartMark = m_xSearchCursor.getBookmark(); }
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
-    FieldCollectionIterator iterInitialField = iterFieldLoop;
+    FieldCollection::iterator iterInitialField = iterFieldLoop;
 
     // Parameter sammeln
     SearchOptions aParam;
@@ -782,7 +782,7 @@ sal_Bool FmSearchEngine::GetCaseSensitive() const
 //------------------------------------------------------------------------
 void FmSearchEngine::clearControlTexts()
 {
-    for (   ControlTextSuppliersIterator aIter = m_aControlTexts.begin();
+    for (   ControlTextSuppliers::iterator aIter = m_aControlTexts.begin();
             aIter < m_aControlTexts.end();
             ++aIter
         )
@@ -1014,9 +1014,9 @@ void FmSearchEngine::SearchNextImpl()
     }
 
     // fuer Arbeit auf Feldliste
-    FieldCollectionIterator iterBegin = m_arrUsedFields.begin();
-    FieldCollectionIterator iterEnd = m_arrUsedFields.end();
-    FieldCollectionIterator iterFieldCheck;
+    FieldCollection::iterator iterBegin = m_arrUsedFields.begin();
+    FieldCollection::iterator iterEnd = m_arrUsedFields.end();
+    FieldCollection::iterator iterFieldCheck;
 
     sal_Int32 nFieldPos;
 
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 972822aef10c..68a7a3638b5d 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4219,7 +4219,7 @@ Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(con
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 #ifdef DBG_UTIL
     // check if we already have a interceptor for the given object
-    for (   ConstInterceptorsIterator aIter = m_aControlDispatchInterceptors.begin();
+    for (   Interceptors::const_iterator aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
         )
@@ -4262,7 +4262,7 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     // search the interceptor responsible for the given object
-    InterceptorsIterator aIter;
+    Interceptors::iterator aIter;
     for (   aIter = m_aControlDispatchInterceptors.begin();
             aIter != m_aControlDispatchInterceptors.end();
             ++aIter
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index ff78efbb733e..2eb41e98b962 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -51,7 +51,6 @@
 #include "svx/fmsrccfg.hxx"
 #include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
-#include <comphelper/stl_types.hxx>
 #include <comphelper/container.hxx>
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/compbase6.hxx>
@@ -66,7 +65,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 typedef std::vector<SdrObject*> SdrObjArray;
-DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > ,FmFormArray);
+typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray;
 
 // catch database exceptions if they occur
 #define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); }
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 61acc3448ba9..c74d7e537793 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 #define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 
+#include <sal/config.h>
+
+#include <vector>
+
 #include "delayedevent.hxx"
 #include "formdispatchinterceptor.hxx"
 #include "sqlparserclient.hxx"
@@ -69,7 +73,6 @@
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <comphelper/stl_types.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <vcl/timer.hxx>
 
@@ -205,7 +208,7 @@ namespace svxform
 
         // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing
         // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class
-        DECLARE_STL_VECTOR(DispatchInterceptionMultiplexer*, Interceptors);
+        typedef std::vector<DispatchInterceptionMultiplexer*> Interceptors;
         Interceptors    m_aControlDispatchInterceptors;
 
     public: