[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Petr Mladek]

 sc/source/ui/attrdlg/scabstdlg.cxx |    3 ++-
 sc/source/ui/docshell/impex.cxx    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit fb2ffa4384c138acfb44e73b4bfa2c4ee81992c9
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Apr 29 14:07:18 2011 +0200

    dlopen-global-symbols.diff: use global namespace for dlopened sym

diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx
index 79481ff..2c3199a 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -48,7 +48,8 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
     OUStringBuffer aStrBuf;
     aStrBuf.appendAscii( SVLIBRARY("scui") );
 
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear() ) )
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(),
+                                                             SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
         fp = ( ScAbstractDialogFactory* (__LOADONCALLAPI*)() )
             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
     if ( fp )
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 21becd5..901810b 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2086,7 +2086,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
 
     ::rtl::OUString sFilterLib(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("scfilt")));
     static ::osl::Module aModule;
-    bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib);
+    bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY);
     if (!bLoaded)
         bLoaded = aModule.load(sFilterLib);
     if (bLoaded)