diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:17:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:17:16 +0000 |
| commit | 6921500961728156513053c92751180d83f2e3f4 (patch) | |
| tree | f4896ae1eeddc2543dcaf36dea72c342448ca7ac /sfx2/source/appl/app.cxx | |
| parent | 863d8ceb1fa82cbccb6e2f3aff52c1f6c5fe1990 (diff) | |
INTEGRATION: CWS sb71 (1.108.84); FILE MERGED
2007/10/12 07:52:45 sb 1.108.84.1: #i75466# osl_loadModule without path no longer works on Mac OS X.
Diffstat (limited to 'sfx2/source/appl/app.cxx')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 1fd5b992f004..aeeb787cf420 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -4,9 +4,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.108 $ + * $Revision: 1.109 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:54:05 $ + * last change: $Author: vg $ $Date: 2007-10-15 13:17:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -780,6 +780,9 @@ void SfxApplication::Invalidate( USHORT nId ) typedef long (SAL_CALL *basicide_handle_basic_error)(void*); typedef rtl_uString* (SAL_CALL *basicide_choose_macro)(void*, BOOL, rtl_uString*); typedef void* (SAL_CALL *basicide_macro_organizer)(INT16); + +extern "C" { static void SAL_CALL thisModule() {} } + IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) { // get basctl dllname @@ -788,7 +791,8 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) ::rtl::OUString aLibName( sLibName ); // load module - oslModule handleMod = osl_loadModule( aLibName.pData, 0 ); + oslModule handleMod = osl_loadModuleRelative( + &thisModule, aLibName.pData, 0 ); // get symbol ::rtl::OUString aSymbol( RTL_CONSTASCII_USTRINGPARAM( "basicide_handle_basic_error" ) ); @@ -874,7 +878,8 @@ void SfxApplication::MacroOrganizer( INT16 nTabId ) ::rtl::OUString aLibName( sLibName ); // load module - oslModule handleMod = osl_loadModule( aLibName.pData, 0 ); + oslModule handleMod = osl_loadModuleRelative( + &thisModule, aLibName.pData, 0 ); // get symbol ::rtl::OUString aSymbol( RTL_CONSTASCII_USTRINGPARAM( "basicide_macro_organizer" ) ); |