diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 23:42:23 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 08:04:23 +0100 |
| commit | 07ab0d43b58cf7ee16c36016d6b9b70c0ebbb9b1 (patch) | |
| tree | ac80d5449c42f832c14eb3fb3030208ae752b282 /xmloff | |
| parent | 4a8175ebeb58555e5d48df134cfaf128293888f1 (diff) | |
Get rid of DECLARE_STL_VECTOR
Change-Id: If4588034fc09e4663b5217669c71f26c0a3b8c8a
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/attriblistmerge.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/forms/attriblistmerge.hxx | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 690345bedae0..d7fb7439e378 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -36,7 +36,7 @@ namespace xmloff sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { sal_Int16 nLeftOver = _nGlobalIndex; - ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); + AttributeListArray::const_iterator aLookupSublist = m_aLists.begin(); for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength()); ++aLookupSublist @@ -55,7 +55,7 @@ namespace xmloff sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { - for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); + for ( AttributeListArray::const_iterator aLookupSublist = m_aLists.begin(); aLookupSublist != m_aLists.end(); ++aLookupSublist ) @@ -74,7 +74,7 @@ namespace xmloff sal_Int16 SAL_CALL OAttribListMerger::getLength( ) throw(RuntimeException) { sal_Int16 nCount = 0; - for ( ConstAttributeListArrayIterator aAccumulate = m_aLists.begin(); + for ( AttributeListArray::const_iterator aAccumulate = m_aLists.begin(); aAccumulate != m_aLists.end(); ++aAccumulate ) diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 6628d9b9f835..b18d03176482 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX #define INCLUDED_XMLOFF_SOURCE_FORMS_ATTRIBLISTMERGE_HXX -#include <comphelper/stl_types.hxx> +#include <sal/config.h> + +#include <vector> + #include <cppuhelper/implbase1.hxx> #include <osl/mutex.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> @@ -39,7 +42,7 @@ namespace xmloff { protected: ::osl::Mutex m_aMutex; - DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >, AttributeListArray ); + typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; ~OAttribListMerger() { } |