[Libreoffice-commits] .: extensions/source

[Fridrich Strba]

 extensions/source/config/ldap/ldapaccess.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0e732d6f09db22b131752d37550b3f35fcae7706
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 10 11:24:26 2012 +0200

    Load the right wldap32.dll
    
    Change-Id: I73c0a5b8265fa92d7aeeadc803d337ef85651781

diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 00e62d9..c3948a1 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -282,8 +282,7 @@ void LdapConnection::loadModule()
     if ( !s_Ldap_Module )
     {
 #if defined WNT
-        s_Ldap_Module = osl_loadModuleRelativeAscii(
-            &thisModule, "wldap32.dll", 0);
+        s_Ldap_Module = osl_loadModuleAscii("wldap32.dll", 0);
 #elif defined WITH_OPENLDAP
         s_Ldap_Module = osl_loadModuleAscii(
             ("libldap-" SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) "."
@@ -295,7 +294,7 @@ void LdapConnection::loadModule()
             &thisModule, "libldap50.so", 0);
 #endif
 
-        if ( s_Ldap_Module != NULL )
+        if ( s_Ldap_Module )
         {
             s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData));
             s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_simple_bind_s")).pData));