diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:30:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:30:34 +0000 |
| commit | 543d3611e2dd62b5504c3f2ac173a355d237a9a2 (patch) | |
| tree | b02b0a7684346d2f15890a2ba5248fb88458f225 /connectivity | |
| parent | 5083b2d5aaca806ce9a6851c883f9ee81e0c9848 (diff) | |
INTEGRATION: CWS sb71 (1.2.8); FILE MERGED
2007/10/11 16:56:00 sb 1.2.8.1: osl::Module::load without path no longer works on Mac OS X.
Diffstat (limited to 'connectivity')
| -rwxr-xr-x | connectivity/source/drivers/macab/MacabDriver.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 8e02ce9412b2..479c85a64767 100755 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MacabDriver.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ihi $ $Date: 2007-09-13 17:52:04 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:30:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -113,6 +113,8 @@ namespace } // -------------------------------------------------------------------------------- +extern "C" { static void SAL_CALL thisModule() {} } + bool MacabImplModule::impl_loadModule() { if ( m_bAttemptedLoadModule ) @@ -123,7 +125,7 @@ bool MacabImplModule::impl_loadModule() "MacabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!"); const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( SAL_MODULENAME( "macabdrv1" ) ); - m_hConnectorModule = osl_loadModule( sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# + m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW ); // LAZY! #i61335# OSL_ENSURE( m_hConnectorModule, "MacabImplModule::impl_loadModule: could not load the implementation library!" ); if ( !m_hConnectorModule ) return false; |