diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
| commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
| tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /jvmfwk/plugins | |
| parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff) | |
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'jvmfwk/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 35d2cd2a55a8..ee8bcbc155db 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -99,7 +99,7 @@ struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {}; OString getPluginJarPath( std::u16string_view sVendor, const OUString& sLocation, - const OUString& sVersion) + std::u16string_view sVersion) { OString ret; OUString sName1("javaplugin.jar"); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 2d972f1cc5ef..ded1fc5f45f5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -37,7 +37,7 @@ public: } test; #endif -SunVersion::SunVersion(const OUString &usVer): +SunVersion::SunVersion(std::u16string_view usVer): m_nUpdateSpecial(0), m_preRelease(Rel_NONE) { OString sVersion= OUStringToOString(usVer, osl_getThreadTextEncoding()); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx index 3c181ed3b7be..0f351dfb0591 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX +#include <sal/config.h> + +#include <string_view> + #include <rtl/ustring.hxx> namespace jfw_plugin @@ -83,7 +87,7 @@ class SunVersion final public: explicit SunVersion(const char* szVer); - explicit SunVersion(const OUString& usVer); + explicit SunVersion(std::u16string_view usVer); ~SunVersion(); /** |