User: vg Date: 2007-10-15 12:31:15+0000 Modified: dba/connectivity/source/drivers/odbc/OFunctions.cxx
Log: INTEGRATION: CWS sb71 (1.9.102); FILE MERGED 2007/10/11 16:56:01 sb 1.9.102.1: osl::Module::load without path no longer works on Mac OS X. File Changes: Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: OFunctions.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OFunctions.cxx?r1=1.9&r2=1.10 Delta lines: +8 -3 ------------------- --- OFunctions.cxx 2006-09-17 03:06:21+0000 1.9 +++ OFunctions.cxx 2007-10-15 12:31:13+0000 1.10 @@ -112,6 +112,8 @@ sal_Bool LoadFunctions(oslModule pODBCso); // ------------------------------------------------------------------------- +extern "C" { static void SAL_CALL thisModule() {} } + // Dynamisches Laden der DLL/shared lib und Adressen der Funktionen besorgen: // Liefert sal_True bei Erfolg. sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) @@ -133,7 +135,8 @@ _rPath = ::rtl::OUString::createFromAscii("libiodbc.dylib"); #else _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1"); - pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModuleRelative( + &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); if ( !pODBCso ) _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); #endif /* MACOSX */ @@ -143,13 +146,15 @@ #endif if ( !pODBCso ) - pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModuleRelative( + &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) #ifdef OS2 { delete pODBCso; _rPath = ::rtl::OUString::createFromAscii("WOD402"); - pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModuleRelative( + &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
