7 files changed, 17 insertions, 8 deletions
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index be14511a4a4b..1c6ad983f47c 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -22,6 +22,7 @@
 #include <sal/config.h>
 
 #include <optional>
+#include <string_view>
 #include <vector>
 
 #include <rtl/ustring.hxx>
@@ -39,7 +40,7 @@ class VendorSettings
 public:
     VendorSettings();
 
-    std::optional<VersionInfo> getVersionInformation(const OUString& sVendor) const;
+    std::optional<VersionInfo> getVersionInformation(std::u16string_view sVendor) const;
 };
 
 /* The class offers functions to retrieve verified bootstrap parameters.
diff --git a/jvmfwk/inc/libxmlutil.hxx b/jvmfwk/inc/libxmlutil.hxx
index 75cd022acd3d..2599cff50596 100644
--- a/jvmfwk/inc/libxmlutil.hxx
+++ b/jvmfwk/inc/libxmlutil.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
 #define INCLUDED_JVMFWK_INC_LIBXMLUTIL_HXX
 
+#include <sal/config.h>
+
+#include <string_view>
+
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 #include <rtl/ustring.hxx>
@@ -84,7 +88,7 @@ class CXmlCharPtr
 public:
     CXmlCharPtr();
     CXmlCharPtr(xmlChar* aDoc);
-    explicit CXmlCharPtr(const OUString&);
+    explicit CXmlCharPtr(std::u16string_view);
     ~CXmlCharPtr();
     CXmlCharPtr& operator=(xmlChar* pObj);
     operator xmlChar*() const { return _object; }
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();
 
     /**
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index df84d7c77f9e..501595c6e857 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -113,9 +113,9 @@ VendorSettings::VendorSettings()
                 "[Java framework] Error in constructor VendorSettings::VendorSettings() (fwkbase.cxx)");
 }
 
-std::optional<VersionInfo> VendorSettings::getVersionInformation(const OUString & sVendor) const
+std::optional<VersionInfo> VendorSettings::getVersionInformation(std::u16string_view sVendor) const
 {
-    OSL_ASSERT(!sVendor.isEmpty());
+    OSL_ASSERT(!sVendor.empty());
     OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8);
     CXPathObjectPtr pathObject = xmlXPathEvalExpression(
         reinterpret_cast<xmlChar const *>(
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 2619e43331c4..f83e14143ef4 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -94,7 +94,7 @@ CXmlCharPtr::CXmlCharPtr(xmlChar * aChar)
 {
 }
 
-CXmlCharPtr::CXmlCharPtr(const OUString & s):
+CXmlCharPtr::CXmlCharPtr(std::u16string_view s):
     _object(nullptr)
 {
     OString o = OUStringToOString(s, RTL_TEXTENCODING_UTF8);