Tag: cws_src680_sb80 User: sb Date: 2007-11-13 15:37:53+0000 Modified: dba/connectivity/source/drivers/odbc/OFunctions.cxx
Log: #i82999# Replaced erroneous osl_loadModuleRelative calls with osl_loadModule again. 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.10&r2=1.10.14.1 Delta lines: +6 -11 -------------------- --- OFunctions.cxx 2007-10-15 12:31:13+0000 1.10 +++ OFunctions.cxx 2007-11-13 15:37:51+0000 1.10.14.1 @@ -4,9 +4,9 @@ * * $RCSfile: OFunctions.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.14.1 $ * - * last change: $Author: vg $ $Date: 2007/10/15 12:31:13 $ + * last change: $Author: sb $ $Date: 2007/11/13 15:37:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,8 +112,6 @@ 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) @@ -135,8 +133,7 @@ _rPath = ::rtl::OUString::createFromAscii("libiodbc.dylib"); #else _rPath = ::rtl::OUString::createFromAscii("libodbc.so.1"); - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if ( !pODBCso ) _rPath = ::rtl::OUString::createFromAscii("libodbc.so"); #endif /* MACOSX */ @@ -146,15 +143,13 @@ #endif if ( !pODBCso ) - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) #ifdef OS2 { delete pODBCso; _rPath = ::rtl::OUString::createFromAscii("WOD402"); - pODBCso = osl_loadModuleRelative( - &thisModule,_rPath.pData,SAL_LOADMODULE_NOW ); + pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); if( !pODBCso) return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
