User: vg Date: 2007-10-15 12:36:55+0000 Modified: dba/dbaccess/source/ui/dlg/odbcconfig.cxx
Log: INTEGRATION: CWS sb71 (1.20.12); FILE MERGED 2007/10/11 16:53:21 sb 1.20.12.1: osl::Module::load without path no longer works on Mac OS X. 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.20&r2=1.21 Delta lines: +6 -1 ------------------- --- odbcconfig.cxx 2007-09-20 14:58:38+0000 1.20 +++ odbcconfig.cxx 2007-10-15 12:36:53+0000 1.21 @@ -158,12 +158,17 @@ #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_loadModule(m_sLibPath.pData, SAL_LOADMODULE_NOW); + m_pOdbcLib = osl_loadModuleRelative( + &thisModule, m_sLibPath.pData, SAL_LOADMODULE_NOW); return (NULL != m_pOdbcLib); #endif } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
