diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /jvmfwk | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/source/fwkbase.cxx | 12 | ||||
| -rw-r--r-- | jvmfwk/source/libxmlutil.cxx | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index 48143b3fe100..84dcbb5d0eca 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -142,7 +142,9 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMin->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - aVersionInfo.sMinVersion = OUString::fromUtf8(OString((sal_Char*)(xmlChar*) sVersion)); + OString osVersion((sal_Char*)(xmlChar*) sVersion); + aVersionInfo.sMinVersion = OStringToOUString( + osVersion, RTL_TEXTENCODING_UTF8); } //Get maxVersion @@ -162,7 +164,9 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, xPathObjectMax->nodesetval->nodeTab[0]->xmlChildrenNode, 1); - aVersionInfo.sMaxVersion = OUString::fromUtf8(OString((sal_Char*) (xmlChar*) sVersion)); + OString osVersion((sal_Char*) (xmlChar*) sVersion); + aVersionInfo.sMaxVersion = OStringToOUString( + osVersion, RTL_TEXTENCODING_UTF8); } //Get excludeVersions @@ -184,7 +188,9 @@ VersionInfo VendorSettings::getVersionInformation(const OUString & sVendor) CXmlCharPtr sVersion; sVersion = xmlNodeListGetString( m_xmlDocVendorSettings, cur->xmlChildrenNode, 1); - OUString usVersion = OUString::fromUtf8(OString((sal_Char*)(xmlChar*) sVersion)); + OString osVersion((sal_Char*)(xmlChar*) sVersion); + OUString usVersion = OStringToOUString( + osVersion, RTL_TEXTENCODING_UTF8); aVersionInfo.addExcludeVersion(usVersion); } } diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx index c7ac695a041e..838c73590102 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 = OUString::fromUtf8(aOStr); + ret = OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8); } return ret; } |