diff options
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 12 | ||||
| -rw-r--r-- | jvmfwk/source/libxmlutil.cxx | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 84dcbb5d0eca..48143b3fe100 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -142,9 +142,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - OString osVersion((sal_Char*)(xmlChar*) sVersion); - aVersionInfo.sMinVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + aVersionInfo.sMinVersion = OUString::fromUtf8(OString((sal_Char*)(xmlChar*) sVersion)); } //Get maxVersion @@ -164,9 +162,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - OString osVersion((sal_Char*) (xmlChar*) sVersion); - aVersionInfo.sMaxVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + aVersionInfo.sMaxVersion = OUString::fromUtf8(OString((sal_Char*) (xmlChar*) sVersion)); } //Get excludeVersions @@ -188,9 +184,7 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) CXmlCharPtr sVersion; sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, cur->xmlChildrenNode, 1); - OString osVersion((sal_Char*)(xmlChar*) sVersion); - OUString usVersion = OStringToOUString( - osVersion, RTL_TEXTENCODING_UTF8); + OUString usVersion = OUString::fromUtf8(OString((sal_Char*)(xmlChar*) sVersion)); aVersionInfo.addExcludeVersion(usVersion); } } diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index 838c73590102..c7ac695a041e 100644 --- a/jvmfwk/source/libxmlutil.cxx +++ b/jvmfwk/source/libxmlutil.cxx @@ -130,7 +130,7 @@ CXmlCharPtr::operator OUString() if (_object != NULL) { OString aOStr((sal_Char*)_object); - ret = OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8); + ret = OUString::fromUtf8(aOStr); } return ret; } |