[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/appl/app.cxx     |    2 ++
 sfx2/source/appl/appserv.cxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit f9695150942341a755a43996d4639eb623d7640b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 11 16:31:55 2014 +0100

    too risky to dlclose basctl once opened
    
    e.g. use macro organizer for the first time and launch a macro, user event
    with handle to basctl function posted
    
    Change-Id: I2f0f4a7536f071926ea1bd6994f8178fbd4a796f

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 78054f4..83794e8 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -494,6 +494,8 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic )
     // get symbol
     basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) aMod.getFunctionSymbol("basicide_handle_basic_error");
 
+    aMod.release();
+
     // call basicide_handle_basic_error in basctl
     long nRet = pSymbol ? pSymbol( pStarBasic ) : 0;
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 0db333f..7d0f4c6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -855,6 +855,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose
     SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!");
     if (!pSymbol)
         return OUString();
+    aMod.release();
 #else
 #define pSymbol basicide_choose_macro
 #endif