User: vg      
Date: 2007-10-15 12:30:50+0000
Modified:
   dba/connectivity/source/drivers/mozab/MDriver.cxx

Log:
 INTEGRATION: CWS sb71 (1.17.102); FILE MERGED
 2007/06/28 09:53:37 sb 1.17.102.2: #i75466# Improved previous fix.
 2007/06/26 13:40:08 sb 1.17.102.1: #i75466# Use new osl_loadModuleRelative to 
locate loaded libs next to calling lib.

File Changes:

Directory: /dba/connectivity/source/drivers/mozab/
==================================================

File [changed]: MDriver.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MDriver.cxx?r1=1.17&r2=1.18
Delta lines:  +3 -1
-------------------
--- MDriver.cxx 2006-09-17 02:56:39+0000        1.17
+++ MDriver.cxx 2007-10-15 12:30:47+0000        1.18
@@ -294,6 +294,8 @@
 }
 
 // 
-----------------------------------------------------------------------------
+extern "C" { static void SAL_CALL thisModule() {} }
+
 bool MozabDriver::ensureInit()
 {
        if ( m_hModule )
@@ -304,7 +306,7 @@
        const ::rtl::OUString sModuleName = 
::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv2" ));
 
        // load the dbtools library
-       m_hModule = osl_loadModule(sModuleName.pData, 0);
+       m_hModule = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
        OSL_ENSURE(NULL != m_hModule, "MozabDriver::ensureInit: could not load 
the dbtools library!");
        if ( !m_hModule )
         return false;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to