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 /extensions/source/config | |
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 'extensions/source/config')
-rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 333a8bcd4c62..2acd02731973 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -228,7 +228,7 @@ void LdapConnection::initConnection() data->insert( LdapData::value_type( OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), - OUString::fromUtf8(*values))); + OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); ldap_value_free(values); } attr = ldap_next_attribute(mConnection, result.msg, ptr); @@ -284,7 +284,7 @@ void LdapConnection::initConnection() #else sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; - userDn = OUString::fromUtf8( charsDn ); + userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); ldap_memfree(charsDn) ; #endif } |