diff options
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 274ce9897be6..13370f472e2d 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -845,16 +845,13 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc = OUString() ) { #ifndef DISABLE_DYNLOADING - // get basctl dllname - static OUString aLibName( SVLIBRARY( "basctl" ) ); + osl::Module aMod; - // load module - oslModule handleMod = osl_loadModuleRelative( - &thisModule, aLibName.pData, 0 ); + // load basctl module + aMod.loadRelative(&thisModule, SVLIBRARY("basctl"), 0); // get symbol - OUString aSymbol( "basicide_choose_macro" ); - basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); + basicide_choose_macro pSymbol = (basicide_choose_macro) aMod.getFunctionSymbol("basicide_choose_macro"); SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!"); if (!pSymbol) return OUString(); |