extensions/source/config/ldap/ldapaccess.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
New commits: commit 0d56e73df7decc32f45d375ec8cc9940f8d249f4 Author: David Tardon <[email protected]> Date: Fri Jul 20 09:37:27 2012 +0200 WaE: invalid conversion from 'PWCHAR' to 'const sal_Unicode*' Change-Id: I55038545ad740891777075c6fadde9959bd7fa1b diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 9675d5f..9bedfe1 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -226,8 +226,10 @@ void LdapConnection::initConnection() while (attr) { PWCHAR * values = ldap_get_valuesW(mConnection, result.msg, attr); if (values) { + const rtl::OUString aAttr( reinterpret_cast<sal_Unicode*>( attr ) ); + const rtl::OUString aValues( reinterpret_cast<sal_Unicode*>( *values ) ); data->insert( - LdapData::value_type( attr, *values )); + LdapData::value_type( aAttr, aValues )); ldap_value_freeW(values); } attr = ldap_next_attributeW(mConnection, result.msg, ptr); @@ -291,7 +293,7 @@ void LdapConnection::initConnection() #ifdef WNT PWCHAR charsDn = ldap_get_dnW(mConnection, entry) ; - userDn = charsDn; + userDn = rtl::OUString( reinterpret_cast<const sal_Unicode*>( charsDn ) ); ldap_memfreeW(charsDn) ; #else sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; commit 286799f43818b9dc5482720c0cd06eeede568758 Author: David Tardon <[email protected]> Date: Fri Jul 20 09:36:57 2012 +0200 WaE: deprecated conversion from string constant to 'PWCHAR' Change-Id: I3500eb6a7ab1c98856a8da13e76135d1073dd6fd diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 6be6ba1..9675d5f 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -205,7 +205,7 @@ void LdapConnection::initConnection() LdapErrCode retCode = ldap_search_sW(mConnection, (PWCHAR) aUserDn.getStr(), LDAP_SCOPE_BASE, - L"(objectclass=*)", + const_cast<PWCHAR>( L"(objectclass=*)" ), 0, 0, // Attributes + values &result.msg) ; @@ -270,7 +270,7 @@ void LdapConnection::initConnection() LdapMessageHolder result; #ifdef WNT - PWCHAR attributes [2] = { L"1.1", NULL }; + PWCHAR attributes [2] = { const_cast<PWCHAR>( L"1.1" ), NULL }; LdapErrCode retCode = ldap_search_sW(mConnection, (PWCHAR) mLdapDefinition.mBaseDN.getStr(), LDAP_SCOPE_SUBTREE, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
