User: obo Date: 2008-01-07 09:50:00+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: INTEGRATION: CWS sb80 (1.22.14); FILE MERGED 2007/11/16 14:49:49 sb 1.22.14.1: #i82999# Replaced erroneous osl_loadModuleRelative call with osl_loadModule again. File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: odbcconfig.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/odbcconfig.cxx?r1=1.22&r2=1.23 Delta lines: +1 -6 ------------------- --- odbcconfig.cxx 2007-11-02 12:22:06+0000 1.22 +++ odbcconfig.cxx 2008-01-07 09:49:57+0000 1.23 @@ -166,17 +166,12 @@ #endif //------------------------------------------------------------------------- -#ifdef HAVE_ODBC_SUPPORT -extern "C" { static void SAL_CALL thisModule() {} } -#endif - sal_Bool OOdbcLibWrapper::load(const sal_Char* _pLibPath) { m_sLibPath = ::rtl::OUString::createFromAscii(_pLibPath); #ifdef HAVE_ODBC_SUPPORT // load the module - m_pOdbcLib = osl_loadModuleRelative( - &thisModule, m_sLibPath.pData, SAL_LOADMODULE_NOW); + m_pOdbcLib = osl_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); return (NULL != m_pOdbcLib); #endif } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
