diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-18 16:38:00 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-18 16:38:00 +0200 |
| commit | e1832ac55e11309815c1fd313fcef9868152fcd3 (patch) | |
| tree | ba83e8d8c2d61fe49e8791377645571748823431 /extensions | |
| parent | 79f15259bc117c27bfe8d1590836ef1565c49278 (diff) | |
Further simplification of ldap includes
Change-Id: I5608cc330104f1e50501c5e63ab05545fcd67fb9
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.hxx | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 45f656b1eeee..cae58f4926ee 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -270,7 +270,7 @@ void LdapConnection::initConnection() LdapMessageHolder result; #ifdef WNT - PWCHAR attributes [2] = { LDAP_NO_ATTRS, NULL }; + PWCHAR attributes [2] = { L"1.1", NULL }; LdapErrCode retCode = ldap_search_sW(mConnection, (PWCHAR) mLdapDefinition.mBaseDN.getStr(), LDAP_SCOPE_SUBTREE, diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx index 0158b13a1c51..17a879060a78 100644 --- a/extensions/source/config/ldap/ldapaccess.hxx +++ b/extensions/source/config/ldap/ldapaccess.hxx @@ -25,31 +25,12 @@ #include <map> #ifdef WNT -#pragma warning (push,1) -#pragma warning (disable:4668) -#endif - -#ifdef WNT #include <windows.h> #include <winldap.h> -#ifndef LDAP_NO_ATTRS -# define LDAP_NO_ATTRS L"1.1" -#endif #else // !defined WNT #include <ldap.h> #endif // WNT -#ifndef LDAP_API -# define LDAP_API(rt) rt -#endif -#ifndef LDAP_CALL -# define LDAP_CALL -#endif - -#ifdef WNT -#pragma warning (pop) -#endif // WNT - #include <com/sun/star/ldap/LdapGenericException.hpp> #include <com/sun/star/ldap/LdapConnectionException.hpp> |