diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:36:53 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:36:53 +0000 |
| commit | b06f59fe89c95dca829576d6adf585b08fc73d07 (patch) | |
| tree | 4fc1e299be87eed9f18fb210127685d6e15a9eb8 /dbaccess/source/ui/dlg/odbcconfig.cxx | |
| parent | a5a99ca35ff72d073eae36306dc3f5dd7247cca5 (diff) | |
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.
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 3abc7bb0e..8815d3de5 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -4,9 +4,9 @@ * * $RCSfile: odbcconfig.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: vg $ $Date: 2007-09-20 14:58:38 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:36:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -158,12 +158,17 @@ OOdbcLibWrapper::OOdbcLibWrapper() #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 } |