diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-04-29 14:07:20 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-29 14:07:20 +0200 |
| commit | 15a4865021a8826d846e31e73c44dd4e4f33776d (patch) | |
| tree | 67bef27aaaaff5c458cc7ccc2cae2bc20ae00f29 | |
| parent | 511f5bff6fe86a28b8bb2081bc7ed9130f52a86f (diff) | |
dlopen-global-symbols.diff: use global namespace for dlopened sym
| -rw-r--r-- | sd/source/filter/sdfilter.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdabstdlg.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index aaba2c2ad..1ff3487ea 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -93,7 +93,8 @@ extern "C" { static void SAL_CALL thisModule() {} } ::osl::Module* SdFilter::OpenLibrary( const ::rtl::OUString& rLibraryName ) const { std::auto_ptr< osl::Module > mod(new osl::Module); - return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName)) + return mod->loadRelative(&thisModule, ImplGetFullLibraryName(rLibraryName), + SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY) ? mod.release() : 0; } diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index 93f2b6024..919c0beda 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -43,7 +43,8 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { SdFuncPtrCreateDialogFactory fp = 0; static ::osl::Module aDialogLibrary; - if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) ) + if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ), + SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SdAbstractDialogFactory* (__LOADONCALLAPI*)() ) aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) ); if ( fp ) |