summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlexp.cxx5
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx6
-rw-r--r--xmloff/source/forms/elementimport.cxx2
-rw-r--r--xmloff/source/forms/elementimport.hxx8
-rw-r--r--xmloff/source/forms/eventexport.cxx6
-rw-r--r--xmloff/source/forms/eventexport.hxx7
-rw-r--r--xmloff/source/forms/formattributes.cxx2
-rw-r--r--xmloff/source/forms/formattributes.hxx7
-rw-r--r--xmloff/source/forms/layerimport.cxx2
-rw-r--r--xmloff/source/forms/layerimport.hxx6
10 files changed, 32 insertions, 19 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3459747cdf4b..68811c168672 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -17,10 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
-
#include <sal/config.h>
+#include <stack>
+#include <string.h>
+
#include <officecfg/Office/Common.hxx>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <osl/mutex.hxx>
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 4d50c63a64c5..884ca77e16f5 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -25,8 +25,8 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <xmloff/xmltkmap.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <comphelper/stl_types.hxx>
+#include <map>
#include <vector>
#include <xmloff/xmlimp.hxx>
@@ -166,8 +166,8 @@ struct DateTimeDeclContextImpl
DateTimeDeclContextImpl() : mbFixed(sal_True) {}
};
-DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap );
-DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap );
+typedef std::map<OUString, OUString> HeaderFooterDeclMap;
+typedef std::map<OUString, DateTimeDeclContextImpl> DateTimeDeclMap;
class SdXMLImport: public SvXMLImport
{
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 0e47e7c91421..171070d53eab 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -120,7 +120,7 @@ namespace xmloff
for (ElementType eType=(ElementType)0; eType<UNKNOWN; ++eType)
s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType;
}
- ConstMapString2ElementIterator aPos = s_sElementTranslations.find(_rName);
+ MapString2Element::const_iterator aPos = s_sElementTranslations.find(_rName);
if (s_sElementTranslations.end() != aPos)
return aPos->second;
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 6e8ffbbaa377..8c4d2e557693 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_ELEMENTIMPORT_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include "propertyimport.hxx"
#include "controlelement.hxx"
#include "valueproperties.hxx"
@@ -33,8 +37,6 @@
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <comphelper/stl_types.hxx>
-
class XMLTextStyleContext;
namespace xmloff
{
@@ -49,7 +51,7 @@ namespace xmloff
class OElementNameMap : public OControlElement
{
protected:
- DECLARE_STL_USTRINGACCESS_MAP( ElementType, MapString2Element );
+ typedef std::map<OUString, ElementType> MapString2Element;
static MapString2Element s_sElementTranslations;
protected:
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 6ec70d6009bf..cebb790daa9a 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -95,7 +95,7 @@ namespace xmloff
Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
- ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
+ MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName);
if (m_aMappedEvents.end() == aPos)
throw NoSuchElementException(
OUString("There is no element named ") += _rName,
@@ -108,7 +108,7 @@ namespace xmloff
{
Sequence< OUString > aReturn(m_aMappedEvents.size());
OUString* pReturn = aReturn.getArray();
- for ( ConstMapString2PropertyValueSequenceIterator aCollect = m_aMappedEvents.begin();
+ for ( MapString2PropertyValueSequence::const_iterator aCollect = m_aMappedEvents.begin();
aCollect != m_aMappedEvents.end();
++aCollect, ++pReturn
)
@@ -119,7 +119,7 @@ namespace xmloff
sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException)
{
- ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
+ MapString2PropertyValueSequence::const_iterator aPos = m_aMappedEvents.find(_rName);
return m_aMappedEvents.end() != aPos;
}
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index 7c40297c9d0e..1886acfef101 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -20,12 +20,15 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_EVENTEXPORT_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <comphelper/stl_types.hxx>
namespace xmloff
{
@@ -45,7 +48,7 @@ namespace xmloff
class OEventDescriptorMapper : public OEventDescriptorMapper_Base
{
protected:
- DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >, MapString2PropertyValueSequence );
+ typedef std::map< OUString, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > MapString2PropertyValueSequence;
MapString2PropertyValueSequence m_aMappedEvents;
public:
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 126aeee12bb3..78b7920d4132 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -229,7 +229,7 @@ namespace xmloff
const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation(
const OUString& _rAttribName)
{
- ConstAttributeAssignmentsIterator aPos = m_aKnownProperties.find(_rAttribName);
+ AttributeAssignments::const_iterator aPos = m_aKnownProperties.find(_rAttribName);
if (m_aKnownProperties.end() != aPos)
return &aPos->second;
return NULL;
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 3136eb9faefa..a710ee0b889e 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -20,10 +20,13 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_FORMATTRIBUTES_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <com/sun/star/beans/XPropertySet.hpp>
#include <sal/types.h>
#include <salhelper/simplereferenceobject.hxx>
-#include <comphelper/stl_types.hxx>
struct SvXMLEnumMapEntry;
@@ -244,7 +247,7 @@ namespace xmloff
};
protected:
- DECLARE_STL_USTRINGACCESS_MAP( AttributeAssignment, AttributeAssignments );
+ typedef std::map<OUString, AttributeAssignment> AttributeAssignments;
AttributeAssignments m_aKnownProperties;
public:
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index adc7998d4c67..26c22c34187b 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -463,7 +463,7 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUStri
Reference< XPropertySet > xReturn;
if (m_aCurrentPageIds != m_aControlIds.end())
{
- ConstMapString2PropertySetIterator aPos = m_aCurrentPageIds->second.find(_rControlId);
+ MapString2PropertySet::const_iterator aPos = m_aCurrentPageIds->second.find(_rControlId);
if (m_aCurrentPageIds->second.end() != aPos)
xReturn = aPos->second;
else
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index b2341b340d2b..207c99671bea 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX
#define INCLUDED_XMLOFF_SOURCE_FORMS_LAYERIMPORT_HXX
+#include <sal/config.h>
+
+#include <map>
+
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/form/XFormsSupplier2.hpp>
#include <rtl/ref.hxx>
@@ -57,7 +61,7 @@ namespace xmloff
SvXMLStylesContext* m_pAutoStyles;
protected:
- DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, MapString2PropertySet );
+ 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);
MapDrawPage2Map m_aControlIds; // ids of the controls on all known page
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 14:39:10 +0000