diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-04 11:14:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-05 12:57:00 +0200 |
| commit | 9f1701d01d9f664828356976d8592492f85b30f5 (patch) | |
| tree | a91eaef0674591af87b06096fdd186283559a8de /jvmfwk | |
| parent | b8bb44161aeb6e00526a38343b63e678ce7d4a1a (diff) | |
use more o3tl::getToken
found by inspecting call sites of OUString::getToken
Change-Id: I4269c7476c7aa46fac39528227e350568f0eb34a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132644
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 3 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 3e8acd674626..9a39f2131940 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -30,6 +30,7 @@ #include <rtl/ustring.hxx> #include <rtl/byteseq.hxx> #include <jvmfwk/framework.hxx> +#include <o3tl/string_view.hxx> static bool hasOption(char const * szOption, int argc, char** argv); @@ -118,7 +119,7 @@ OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData) OUString sData(chars, len / 2); //the runtime lib is on the first line sal_Int32 index = 0; - OUString aToken = sData.getToken( 1, '\n', index); + std::u16string_view aToken = o3tl::getToken(sData, 1, '\n', index); OString paths = OUStringToOString(aToken, osl_getThreadTextEncoding()); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index b596e18cf480..ce297512482c 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -1043,7 +1043,7 @@ void addJavaInfosFromPath( sal_Int32 nIndex = 0; do { - OUString usToken = usAllPath.getToken( 0, SAL_PATHSEPARATOR, nIndex ); + OUString usToken( usAllPath.getToken( 0, SAL_PATHSEPARATOR, nIndex ) ); OUString usTokenUrl; if(File::getFileURLFromSystemPath(usToken, usTokenUrl) == File::E_None) { |