User: vg Date: 2007-10-15 12:30:24+0000 Modified: dba/connectivity/source/drivers/kab/KDriver.cxx
Log: INTEGRATION: CWS sb71 (1.8.102); FILE MERGED 2007/06/28 09:53:50 sb 1.8.102.1: #i75466# Use new osl_loadModuleRelative to locate loaded libs next to calling lib. File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KDriver.cxx?r1=1.8&r2=1.9 Delta lines: +3 -1 ------------------- --- KDriver.cxx 2006-09-17 02:52:25+0000 1.8 +++ KDriver.cxx 2007-10-15 12:30:22+0000 1.9 @@ -136,6 +136,8 @@ } // -------------------------------------------------------------------------------- +extern "C" { void SAL_CALL thisModule() {} } + bool KabImplModule::impl_loadModule() { if ( m_bAttemptedLoadModule ) @@ -146,7 +148,7 @@ "KabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( SAL_MODULENAME( "kabdrv1" ) ); - m_hConnectorModule = osl_loadModule( sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# + m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) return false; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
