From bcb51cff22f385abe71555f8d7fdbec2697bf188 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Wed, 6 Nov 2013 15:07:46 -0200
Subject: 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>
---
 extensions/source/resource/ResourceIndexAccess.cxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index aff2218f832c..93d06b2744aa 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -11,7 +11,6 @@
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <comphelper/stlunosequence.hxx>
 #include <osl/mutex.hxx>
 #include <tools/rcid.h>
 #include <tools/resary.hxx>
@@ -24,9 +23,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-using ::comphelper::stl_begin;
-using ::comphelper::stl_end;
-
 namespace
 {
     static ::boost::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
@@ -108,7 +104,7 @@ Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName)
 {
     const Sequence<OUString> aNames(getElementNames());
     Reference<XIndexAccess> xResult;
-    switch(::std::find(stl_begin(aNames), stl_end(aNames), aName)-stl_begin(aNames))
+    switch(::std::find(aNames.begin(), aNames.end(), aName) - aNames.begin())
     {
         case 0:
             xResult = Reference<XIndexAccess>(new ResourceStringIndexAccess(m_pResMgr));
@@ -139,7 +135,7 @@ Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames(  )
     throw (RuntimeException)
 {
     const Sequence<OUString> aNames(getElementNames());
-    return (::std::find(stl_begin(aNames), stl_end(aNames), aName) != stl_end(aNames));
+    return (::std::find(aNames.begin(), aNames.end(), aName) != aNames.end());
 }
 
 Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
-- 
cgit