[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                      |    5 -
 patches/dev300/dlopen-global-symbols.diff |   83 ------------------------------
 2 files changed, 88 deletions(-)

New commits:
commit e8a2bceead996e55d9109bf504c411ed902857ba
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 29 14:09:38 2011 +0200

    pushed dlopen-global-symbols.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 48370e4..703c369 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1267,11 +1267,6 @@ system-lpsolve-rpath.diff, rengelha
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 
-[ Fixes ]
-# make dlopen-ed libs to use the global namespace for symbol
-# resolution
-dlopen-global-symbols.diff, thorsten
-
 [ DebianBaseOnly ]
 # link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
 system-lpsolve-link-with-colamd.diff, rengelha
diff --git a/patches/dev300/dlopen-global-symbols.diff b/patches/dev300/dlopen-global-symbols.diff
deleted file mode 100644
index 3647f30..0000000
--- a/patches/dev300/dlopen-global-symbols.diff
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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 )
---- 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(RTL_CONSTASCII_USTRINGPARAM( "ScFilterCreate" )) );
-     if (fn != NULL)
---- 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;
- }
- 
---- 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 )
---- 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;
---- 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;
-     static const ::rtl::OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True));
--    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ) ) )
-+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( sLibName ),
-+                                                             SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
-         fp = ( SwAbstractDialogFactory* (__LOADONCALLAPI*)() )
-             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")));
-     if ( fp )
---- 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(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
-     if ( fp )