diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-14 12:50:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-14 17:50:11 +0000 |
| commit | 899dfbca1755f730dc935ca0d929236f999b9879 (patch) | |
| tree | 1bd455232191f057c088791145f0d1fb8329ce9d /jvmfwk/source | |
| parent | e056c1ce10779b42ae17866913cf4db06b86a491 (diff) | |
elide some temporary OStrings
where we can pass a string_view into OStringToOUString
Change-Id: If7803ba49aa15f6e9c7bd386d32fb84003155390
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148844
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 14 | ||||
| -rw-r--r-- | jvmfwk/source/libxmlutil.cxx | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 43820a926dc7..29ba07c3ae84 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -160,9 +160,7 @@ VersionInfo VendorSettings::getVersionInformation(std::u16string_view sVendor) c CXmlCharPtr sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - OString osVersion(sVersion); - aVersionInfo.sMinVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + aVersionInfo.sMinVersion = sVersion; } //Get maxVersion @@ -180,9 +178,7 @@ VersionInfo VendorSettings::getVersionInformation(std::u16string_view sVendor) c CXmlCharPtr sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - OString osVersion(sVersion); - aVersionInfo.sMaxVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + aVersionInfo.sMaxVersion = sVersion; } //Get excludeVersions @@ -202,9 +198,7 @@ VersionInfo VendorSettings::getVersionInformation(std::u16string_view sVendor) c { CXmlCharPtr sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, cur->xmlChildrenNode, 1); - OString osVersion(sVersion); - OUString usVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + OUString usVersion = sVersion; aVersionInfo.vecExcludeVersions.push_back(usVersion); } } @@ -341,7 +335,7 @@ OUString BootParams::getJREHome() UNO_JAVA_JFW_ENV_JREHOME" is set, but the environment variable " "JAVA_HOME is not set."); } - OString osJRE(pJRE); + std::string_view osJRE(pJRE); OUString usJRE = OStringToOUString(osJRE, osl_getThreadTextEncoding()); if (File::getFileURLFromSystemPath(usJRE, sJRE) != File::E_None) throw FrameworkException( diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index f83e14143ef4..fa8f6eeee1e0 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -124,7 +124,7 @@ CXmlCharPtr::operator OUString() OUString ret; if (_object != nullptr) { - OString aOStr(reinterpret_cast<char*>(_object)); + std::string_view aOStr(reinterpret_cast<char*>(_object)); ret = OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8); } return ret; |