diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-01 20:57:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-02 09:14:49 +0100 |
| commit | fa16d060236346beb80ecb3596186ae9df469432 (patch) | |
| tree | 1527a472df143596ca3f6f0636945d6a97608cb1 /sfx2 | |
| parent | a24ef8484090f4f5304caa4a508c6bc9689bcbb8 (diff) | |
coverity#705707 Resource leak
and
coverity#705706 Resource leak
Change-Id: Ia18954acb430464c94c5dd608abf9d6e8214058a
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/app.cxx | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 0516b0bc9d2d..78054f4f00e4 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -487,16 +487,12 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) #else #ifndef DISABLE_DYNLOADING - // get basctl dllname - static OUString aLibName( SVLIBRARY( "basctl" ) ); - - // load module - oslModule handleMod = osl_loadModuleRelative( - &thisModule, aLibName.pData, 0 ); + // load basctl module + osl::Module aMod; + aMod.loadRelative(&thisModule, SVLIBRARY("basctl"), 0); // get symbol - OUString aSymbol( "basicide_handle_basic_error" ); - basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData ); + basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) aMod.getFunctionSymbol("basicide_handle_basic_error"); // call basicide_handle_basic_error in basctl long nRet = pSymbol ? pSymbol( pStarBasic ) : 0; @@ -587,16 +583,12 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #else #ifndef DISABLE_DYNLOADING - // get basctl dllname - static OUString aLibName( SVLIBRARY( "basctl" ) ); - - // load module - oslModule handleMod = osl_loadModuleRelative( - &thisModule, aLibName.pData, 0 ); + // load basctl module + osl::Module aMod; + aMod.loadRelative(&thisModule, SVLIBRARY("basctl"), 0); // get symbol - OUString aSymbol( "basicide_macro_organizer" ); - basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); + basicide_macro_organizer pSymbol = (basicide_macro_organizer) aMod.getFunctionSymbol("basicide_macro_organizer"); SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!"); if (!pSymbol) |