Seen dlopen-global-symbols.diff in master, removing.

2 files changed, 0 insertions, 114 deletions

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 307529189..aa59ca5f0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -220,10 +220,6 @@ unoxml-fix-empty-xmlns.diff, rodo
 build-fix-xulrunner-npapi-inc.diff, janneke
 # FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
-# make dlopen-ed libs to use the global namespace for symbol
-# resolution
-dlopen-global-symbols.diff, thorsten
-
 # fix framework to no longer pull presenter screen for all apps
 # needs some more love, see comments in issue
 framework-extra-job-config.diff, i#107568, thorsten
diff --git a/patches/dev300/dlopen-global-symbols.diff b/patches/dev300/dlopen-global-symbols.diff
deleted file mode 100644
index 149169a43..000000000
--- a/patches/dev300/dlopen-global-symbols.diff
+++ /dev/null
@@ -1,110 +0,0 @@
----
- sc/source/ui/attrdlg/scabstdlg.cxx |    3 ++-
- sc/source/ui/docshell/impex.cxx    |    3 ++-
- sd/source/filter/sdfilter.cxx      |    3 ++-
- sd/source/ui/dlg/sdabstdlg.cxx     |    3 ++-
- sw/source/filter/basflt/fltini.cxx |    3 ++-
- sw/source/ui/dialog/swabstdlg.cxx  |    3 ++-
- vcl/source/window/abstdlg.cxx      |    3 ++-
- 7 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git sc/source/ui/attrdlg/scabstdlg.cxx sc/source/ui/attrdlg/scabstdlg.cxx
-index 0f0ec34..2d32560 100644
---- sc/source/ui/attrdlg/scabstdlg.cxx
-+++ sc/source/ui/attrdlg/scabstdlg.cxx
-@@ -47,7 +47,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 sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx
-index 9c839f5..01542c2 100644
---- sc/source/ui/docshell/impex.cxx
-+++ sc/source/ui/docshell/impex.cxx
-@@ -2102,7 +2102,8 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
- 
-     static ::osl::Module aModule;
-     if ( aModule.loadRelative( &thisModule,
--                   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ) ) )
-+                   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ),
-+                               SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
-     {
-     oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( "ScFilterCreate" ) );
-     if (fn != NULL)
-diff --git sd/source/filter/sdfilter.cxx sd/source/filter/sdfilter.cxx
-index 62ac970..b2852b9 100644
---- sd/source/filter/sdfilter.cxx
-+++ sd/source/filter/sdfilter.cxx
-@@ -92,7 +92,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 sd/source/ui/dlg/sdabstdlg.cxx sd/source/ui/dlg/sdabstdlg.cxx
-index f0c6d81..1044826 100644
---- sd/source/ui/dlg/sdabstdlg.cxx
-+++ sd/source/ui/dlg/sdabstdlg.cxx
-@@ -42,7 +42,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 )
-diff --git sw/source/filter/basflt/fltini.cxx sw/source/filter/basflt/fltini.cxx
-index e1b341a..8076abd 100644
---- sw/source/filter/basflt/fltini.cxx
-+++ sw/source/filter/basflt/fltini.cxx
-@@ -969,7 +969,7 @@ static oslGenericFunction GetMswordLibSy
-     static sal_Bool bLoaded = sal_False;
-     static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "msword" ) ) );
-     if (!bLoaded)
--        bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule );
-+        bLoaded = SvLibrary::LoadModule( aModule, aLibName, &thisModule, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY );
-     if (bLoaded)
-         return aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( pSymbol ) );
-     return NULL;
-diff --git sw/source/ui/dialog/swabstdlg.cxx sw/source/ui/dialog/swabstdlg.cxx
-index 2214dc5..32a7a2d 100644
---- sw/source/ui/dialog/swabstdlg.cxx
-+++ sw/source/ui/dialog/swabstdlg.cxx
-@@ -42,7 +42,8 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
- {
-     SwFuncPtrCreateDialogFactory 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 = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() )
-             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")));
-     if ( fp )
-diff --git vcl/source/window/abstdlg.cxx vcl/source/window/abstdlg.cxx
-index d032393..f47f70b 100644
---- vcl/source/window/abstdlg.cxx
-+++ vcl/source/window/abstdlg.cxx
-@@ -42,7 +42,8 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
- {
-     FuncPtrCreateDialogFactory 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 = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() )
-             aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
-     if ( fp )
--- 
-1.7.0.1
-