From c78f7d85ab72a447cabbeebcc76706b796c7308a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 6 Dec 2013 10:17:37 +0100
Subject: Get rid of DECLARE_STL_MAP

Change-Id: Ifbda934a89087fcc1c031978d3e5b5783722b328
---
 svx/source/fmcomp/gridctrl.cxx | 10 +++++-----
 svx/source/inc/fmvwimp.hxx     |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'svx')

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ef267c0d25b9..957d7b478028 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -53,10 +53,10 @@
 #include "fmservs.hxx"
 #include "sdbdatacolumn.hxx"
 
-#include <comphelper/stl_types.hxx>
 #include <comphelper/property.hxx>
 
 #include <algorithm>
+#include <map>
 
 using namespace ::svxform;
 using namespace ::svt;
@@ -117,7 +117,7 @@ private:
 };
 
 class GridFieldValueListener;
-DECLARE_STL_MAP(sal_uInt16, GridFieldValueListener*, ::std::less<sal_uInt16>, ColumnFieldValueListeners);
+typedef std::map<sal_uInt16, GridFieldValueListener*> ColumnFieldValueListeners;
 
 DBG_NAME(GridFieldValueListener)
 class GridFieldValueListener : protected ::comphelper::OPropertyChangeListener
@@ -3464,7 +3464,7 @@ void DbGridControl::BeginCursorAction()
     if (m_pFieldListeners)
     {
         ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners;
-        ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+        ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
         while (aIter != pListeners->end())
         {
             GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3483,7 +3483,7 @@ void DbGridControl::EndCursorAction()
     if (m_pFieldListeners)
     {
         ColumnFieldValueListeners* pListeners = (ColumnFieldValueListeners*)m_pFieldListeners;
-        ConstColumnFieldValueListenersIterator aIter = pListeners->begin();
+        ColumnFieldValueListeners::const_iterator aIter = pListeners->begin();
         while (aIter != pListeners->end())
         {
             GridFieldValueListener* pCurrent = (*aIter).second;
@@ -3590,7 +3590,7 @@ void DbGridControl::FieldListenerDisposing(sal_uInt16 _nId)
         return;
     }
 
-    ColumnFieldValueListenersIterator aPos = pListeners->find(_nId);
+    ColumnFieldValueListeners::iterator aPos = pListeners->find(_nId);
     if (aPos == pListeners->end())
     {
         OSL_FAIL("DbGridControl::FieldListenerDisposing : invalid call (did not find the listener) !");
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 5133709d5d99..c589c23ff41b 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 #define INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include "svx/svdmark.hxx"
 #include "fmdocumentclassification.hxx"
 
-- 
cgit