diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:31:37 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:31:37 +0000 |
commit | 48a5f1988a9de5f4347482046ae041b91ced9ff7 (patch) | |
tree | 2eaf6768c2e3ed695468eb1a1cbb2a918aad46e3 /comphelper | |
parent | 1dcecc947ca944c5e8341afec69cf3593c5ab8fe (diff) |
INTEGRATION: CWS stliterators (1.5.18); FILE MERGED
2008/05/08 11:08:02 b_michaelsen 1.5.18.2: taking parameters by reference, not a pointer
2008/05/08 10:38:50 b_michaelsen 1.5.18.1: added convenience functions ::comphelper::stl_begin and ::comphelper::stl_end in stlunosequence.hxx and updated some tests
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/misc/string.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 6bbc77fd73eb..cc7c30b3297a 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: string.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -34,10 +34,12 @@ #include <cstddef> #include <string.h> #include <vector> +#include <algorithm> #include "comphelper/string.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "comphelper/stlunosequence.hxx" namespace comphelper { namespace string { @@ -95,9 +97,11 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString& searchAndReplaceAsciiI( } } while (idx >= 0); ::com::sun::star::uno::Sequence< ::rtl::OUString > kws(vec.size()); + std::copy(vec.begin(), vec.end(), stl_begin(kws)); + /* for (size_t i = 0; i < vec.size(); ++i) { kws[i] = vec.at(i); - } + }*/ return kws; } |