diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:04:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-19 13:04:20 +0000 |
| commit | 991ca7a8e02969336596d6472243046dbe8b1bed (patch) | |
| tree | bc592f8047e041ece434c06b17be1b985436fa8e /extensions/source/config | |
| parent | 6a5bc3bb5178eca90bd673a90ee40a5a317432ff (diff) | |
INTEGRATION: CWS sb50 (1.3.114); FILE MERGED
2006/03/29 11:48:57 sb 1.3.114.1: #i61729# Decode LDAP string value using UTF8 instead of ASCII_US; plus some cleanup of strange, obviously broken code.
Diffstat (limited to 'extensions/source/config')
| -rw-r--r-- | extensions/source/config/ldap/ldapuserprof.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/extensions/source/config/ldap/ldapuserprof.cxx b/extensions/source/config/ldap/ldapuserprof.cxx index 2edcc21c8f53..61726c292bf4 100644 --- a/extensions/source/config/ldap/ldapuserprof.cxx +++ b/extensions/source/config/ldap/ldapuserprof.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ldapuserprof.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:22:58 $ + * last change: $Author: hr $ $Date: 2006-04-19 14:04:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -137,16 +137,10 @@ void LdapUserProfileMap::ldapToUserProfile(LDAP *aConnection, if (values != NULL) { - rtl::OUString aStr = rtl::OUString::createFromAscii(*values); - if ((*values[0] != ' ') && ((*values+1) !=0)) - { - - aProfile.mProfile [i].mValue = rtl::OStringToOUString( - *values, - RTL_TEXTENCODING_ASCII_US); - ldap_value_free(values) ; - break ; - } + aProfile.mProfile[i].mValue = rtl::OStringToOUString( + *values, RTL_TEXTENCODING_UTF8); + ldap_value_free(values); + break; } } } |