Tag: cws_src680_sb71 User: sb Date: 2007-06-26 13:40:12+0000 Modified: dba/connectivity/source/drivers/mozab/MDriver.cxx dba/connectivity/source/drivers/mozab/MServices.cxx
Log: #i75466# Use new osl_loadModuleRelative to locate loaded libs next to calling lib. File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MDriver.cxx?r1=1.17&r2=1.17.102.1 Delta lines: +8 -4 ------------------- --- MDriver.cxx 2006-09-17 02:56:39+0000 1.17 +++ MDriver.cxx 2007-06-26 13:40:08+0000 1.17.102.1 @@ -4,9 +4,9 @@ * * $RCSfile: MDriver.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.102.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:56:39 $ + * last change: $Author: sb $ $Date: 2007/06/26 13:40:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -294,6 +294,8 @@ } // ----------------------------------------------------------------------------- +extern "C" { static void SAL_CALL thisModule() {} } + bool MozabDriver::ensureInit() { if ( m_hModule ) @@ -304,7 +306,9 @@ const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv2" )); // load the dbtools library - m_hModule = osl_loadModule(sModuleName.pData, 0); + m_hModule = osl_loadModuleRelative( + reinterpret_cast< oslGenericFunction >(&thisModule), sModuleName.pData, + 0); OSL_ENSURE(NULL != m_hModule, "MozabDriver::ensureInit: could not load the dbtools library!"); if ( !m_hModule ) return false; File [changed]: MServices.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MServices.cxx?r1=1.6&r2=1.6.102.1 Delta lines: +6 -4 ------------------- --- MServices.cxx 2006-09-17 02:57:41+0000 1.6 +++ MServices.cxx 2007-06-26 13:40:08+0000 1.6.102.1 @@ -4,9 +4,9 @@ * * $RCSfile: MServices.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.102.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:57:41 $ + * last change: $Author: sb $ $Date: 2007/06/26 13:40:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -178,7 +178,9 @@ const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii(SAL_MODULENAME( "mozabdrv2" )); // load the dbtools library - oslModule s_hModule = osl_loadModule(sModuleName.pData, 0); + oslModule s_hModule = osl_loadModuleRelative( + reinterpret_cast< oslGenericFunction >(&createMozillaBootstrap), + sModuleName.pData, 0); OSL_ENSURE(NULL != s_hModule, "MozabDriver::registerClient: could not load the dbtools library!"); if (NULL != s_hModule) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
