6 files changed, 16 insertions, 11 deletions
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index 8a6a99e8d365..87f490f237f9 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -123,7 +123,7 @@ namespace xmloff
         // loop through all elements
         sal_Int32 nCount = _rxContainer->getCount();
         Reference< XPropertySet > xCurrent;
-        ConstMapPropertySet2ScriptSequenceIterator aRegisteredEventsPos;
+        MapPropertySet2ScriptSequence::const_iterator aRegisteredEventsPos;
         for (sal_Int32 i=0; i<nCount; ++i)
         {
             ::cppu::extractInterface(xCurrent, _rxContainer->getByIndex(i));
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index a7a56cb8a112..8f38159f483e 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -20,6 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTIMPORT_HXX
 
+#include <sal/config.h>
+
+#include <map>
+
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "callbacks.hxx"
 #include "ifacecompare.hxx"
@@ -47,11 +51,11 @@ namespace xmloff
     class ODefaultEventAttacherManager : public IEventAttacherManager
     {
     protected:
-        DECLARE_STL_MAP(
-            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >,              // map from
-            ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >,     // map to
-            OPropertySetCompare,                                                                    // compare method
-            MapPropertySet2ScriptSequence);                                                         // class name
+        typedef std::map<
+            ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >,
+            ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >,
+            OPropertySetCompare>
+            MapPropertySet2ScriptSequence;
         // usually an event attacher manager will need to collect all script events registered, 'cause
         // the _real_ XEventAttacherManager handles it's events by index, but out indicies are not fixed
         // until _all_ controls have been inserted.
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 3738aa5beb23..3ff18dbf398f 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -391,7 +391,7 @@ namespace xmloff
     {
         OUString sNumberStyle;
 
-        ConstMapPropertySet2IntIterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl);
+        MapPropertySet2Int::const_iterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl);
         if (m_aControlNumberFormats.end() != aControlFormatPos)
         {
             OSL_ENSURE(m_pControlNumberStyles, "OFormLayerXMLExport_Impl::getControlNumberStyle: have a control which has a format style, but no style exporter!");
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 2089d3ba4b91..3a6423170931 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/config.h>
 
+#include <map>
 #include <set>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -111,7 +112,7 @@ namespace xmloff
         // TODO: To avoid this construct above, and to have a cleaner implementation, an class encapsulating the
         // export of a single page should be introduced.
 
-        DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, sal_Int32, OPropertySetCompare, MapPropertySet2Int);
+        typedef std::map<css::uno::Reference<css::beans::XPropertySet>, sal_Int32, OPropertySetCompare> MapPropertySet2Int;
         MapPropertySet2Int  m_aControlNumberFormats;
             // maps controls to format keys, which are relative to our own formats supplier
 
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 26c22c34187b..4779b4e18ce6 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -392,7 +392,7 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa
         return;
 
     // add a new entry to our page map
-    ::std::pair< MapDrawPage2MapIterator, bool > aPagePosition;
+    ::std::pair< MapDrawPage2Map::iterator, bool > aPagePosition;
     aPagePosition =
         m_aControlIds.insert(MapDrawPage2Map::value_type(_rxDrawPage, MapString2PropertySet()));
     OSL_ENSURE(aPagePosition.second, "OFormLayerXMLImport_Impl::startPage: already imported this page!");
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 207c99671bea..86beb9e282a2 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -62,10 +62,10 @@ namespace xmloff
 
     protected:
         typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > MapString2PropertySet;
-        DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map);
+        typedef std::map<css::uno::Reference<css::drawing::XDrawPage>, MapString2PropertySet, ODrawPageCompare> MapDrawPage2Map;
 
         MapDrawPage2Map         m_aControlIds;          // ids of the controls on all known page
-        MapDrawPage2MapIterator m_aCurrentPageIds;      // ifs of the controls on the current page
+        MapDrawPage2Map::iterator m_aCurrentPageIds;      // ifs of the controls on the current page
 
         typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString >
                                 ModelStringPair;