summaryrefslogtreecommitdiffstats
path: root/configmgr
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-04-12 12:43:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-04-13 08:38:53 +0200
commitfdfd517a6f75e394ddcb1e195decbfed33ba56b9 (patch)
treee3bff14e5531affcd908415b4e85d7ceac4aa1fd /configmgr
parentUpdate remaining DevGuide wiki links. (diff)
downloadcore-fdfd517a6f75e394ddcb1e195decbfed33ba56b9.tar.gz
core-fdfd517a6f75e394ddcb1e195decbfed33ba56b9.zip
loplugin:stringviewparam whitelist some more functions
for which we have o3tl:: equivalents Change-Id: I4670fd8b703ac47214be213f41e88d1c6ede7032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132913 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/components.cxx5
-rw-r--r--configmgr/source/components.hxx2
2 files changed, 4 insertions, 3 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 3863103e2763..cf1375956571 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -51,6 +51,7 @@
#include <salhelper/thread.hxx>
#include <tools/diagnose_ex.h>
#include <comphelper/backupfilehelper.hxx>
+#include <o3tl/string_view.hxx>
#include "additions.hxx"
#include "components.hxx"
@@ -715,11 +716,11 @@ void Components::parseFiles(
}
void Components::parseFileList(
- int layer, FileParser * parseFile, OUString const & urls,
+ int layer, FileParser * parseFile, std::u16string_view urls,
bool recordAdditions)
{
for (sal_Int32 i = 0;;) {
- OUString url(urls.getToken(0, ' ', i));
+ OUString url(o3tl::getToken(urls, 0, ' ', i));
if (!url.isEmpty()) {
Additions * adds = nullptr;
if (recordAdditions) {
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index a44097810015..08f14a8b7bf9 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -122,7 +122,7 @@ private:
OUString const & url, bool recursive);
void parseFileList(
- int layer, FileParser * parseFile, OUString const & urls,
+ int layer, FileParser * parseFile, std::u16string_view urls,
bool recordAdditions);
void parseXcdFiles(int layer, OUString const & url);