diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-11-06 15:07:46 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-07 10:43:34 -0600 |
| commit | bcb51cff22f385abe71555f8d7fdbec2697bf188 (patch) | |
| tree | 4ca8f3c2b755a018f96d03ff43da2dc0ee0f6c69 /xmloff/source/text | |
| parent | d877941fc7bb690d0c5b132a914920cf65f8abb2 (diff) | |
fdo#63020: Replace ::comphelper::stl_begin()...
And use some templates inside include/com/sun/star/uno/Sequence.hxx
Change-Id: I48875fa1517751fc4cb0cf2b6c08b88975a29b47
Reviewed-on: https://gerrit.libreoffice.org/6599
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff/source/text')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/text/txtparae.cxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 245a7b2762a3..20349a6457bf 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -58,7 +58,6 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <txtlists.hxx> #include <xmloff/odffields.hxx> -#include <comphelper/stlunosequence.hxx> using ::com::sun::star::ucb::XAnyCompare; @@ -869,7 +868,7 @@ namespace if(!vListEntries.empty()) { Sequence<OUString> vListEntriesSeq(vListEntries.size()); - copy(vListEntries.begin(), vListEntries.end(), ::comphelper::stl_begin(vListEntriesSeq)); + copy(vListEntries.begin(), vListEntries.end(), vListEntriesSeq.begin()); vOutParams[OUString(ODF_FORMDROPDOWN_LISTENTRY)] = makeAny(vListEntriesSeq); } for(::std::map<OUString, Any>::const_iterator pCurrent = vOutParams.begin(); diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index bc9820944274..d8cb673efba9 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -98,7 +98,6 @@ #include "MultiPropertySetHelper.hxx" #include <xmloff/formlayerexport.hxx> #include "XMLTextCharStyleNamesElementExport.hxx" -#include <comphelper/stlunosequence.hxx> #include <xmloff/odffields.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> @@ -382,7 +381,7 @@ void FieldParamExporter::Export() const Type aSeqType = ::getCppuType((Sequence<OUString>*)0); const Type aIntType = ::getCppuType((sal_Int32*)0); Sequence<OUString> vParameters(m_xFieldParams->getElementNames()); - for(const OUString* pCurrent=::comphelper::stl_begin(vParameters); pCurrent!=::comphelper::stl_end(vParameters); ++pCurrent) + for(const OUString* pCurrent = vParameters.begin(); pCurrent != vParameters.end(); ++pCurrent) { const Any aValue = m_xFieldParams->getByName(*pCurrent); const Type aValueType = aValue.getValueType(); @@ -423,7 +422,7 @@ void FieldParamExporter::Export() { Sequence<OUString> vValue; aValue >>= vValue; - for(OUString* pSeqCurrent = ::comphelper::stl_begin(vValue); pSeqCurrent != ::comphelper::stl_end(vValue); ++pSeqCurrent) + for(OUString* pSeqCurrent = vValue.begin(); pSeqCurrent != vValue.end(); ++pSeqCurrent) { ExportParameter(*pCurrent, *pSeqCurrent); } |