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>

4 files changed, 5 insertions, 10 deletions

diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index 3b0ba42c0fe6..744e54ea68ae 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -497,7 +497,6 @@
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/stl_types.hxx>
-#include <comphelper/stlunosequence.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 3b3097b60033..c14d5ae466f5 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -24,7 +24,6 @@
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmltoken.hxx>
 
-#include <comphelper/stlunosequence.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -174,13 +173,12 @@ RDFaExportHelper::AddRDFa(
 
         OUStringBuffer property;
         ::comphelper::intersperse(
-            ::boost::make_transform_iterator(
-                ::comphelper::stl_begin(rStatements),
+            ::boost::make_transform_iterator(rStatements.begin(),
                 ::boost::bind(&makeCURIE, &m_rExport,
                     ::boost::bind(&rdf::Statement::Predicate, _1))),
             // argh, this must be the same type :(
             ::boost::make_transform_iterator(
-                ::comphelper::stl_end(rStatements),
+                rStatements.end(),
                 ::boost::bind(&makeCURIE, &m_rExport,
                     ::boost::bind(&rdf::Statement::Predicate, _1))),
             ::comphelper::OUStringBufferAppender(property),
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);
             }