summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-11-25 09:41:33 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-11-25 10:53:32 +0100
commite8227dc4af54c39e871b12f2e846fa54cff11581 (patch)
tree88a93d4a1cea756eb865f893fe63d87546299b49 /jvmfwk
parent696739056f37430154d6333b8f7228d1c44d09b3 (diff)
loplugin:stringview (clang-cl)
Change-Id: I47b44c80b2a5e3c9d84f5d7257efe17f138a1067 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106563 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index f47b0a3ee4fd..94affa946402 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -482,7 +482,7 @@ static void load_msvcr(OUString const & jvm_dll, std::u16string_view msvcr)
}
if (LoadLibraryW(
- o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr())))
+ o3tl::toW(OUString(OUString::Concat(jvm_dll.subView(0, slash+1)) + msvcr).getStr())))
return;
// Then check if msvcr71.dll is in the parent folder of where
@@ -494,7 +494,7 @@ static void load_msvcr(OUString const & jvm_dll, std::u16string_view msvcr)
return;
(void)LoadLibraryW(
- o3tl::toW(OUString(jvm_dll.copy(0, slash+1) + msvcr).getStr()));
+ o3tl::toW(OUString(OUString::Concat(jvm_dll.subView(0, slash+1)) + msvcr).getStr()));
}
// Check if the jvm DLL imports msvcr71.dll, and in that case try