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

[Tor Lillqvist]

 patches/dev300/apply                      |    7 ++++-
 patches/dev300/dlopen-global-symbols.diff |   37 ++++--------------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

New commits:
commit 883a4a0a6eb8898a4e74798c942de7654abeed15
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 13:33:24 2011 +0300

    Make dlopen-global-symbols.diff apply again

diff --git a/patches/dev300/dlopen-global-symbols.diff b/patches/dev300/dlopen-global-symbols.diff
index 149169a..3647f30 100644
--- a/patches/dev300/dlopen-global-symbols.diff
+++ b/patches/dev300/dlopen-global-symbols.diff
@@ -1,15 +1,3 @@
----
- 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()
@@ -22,8 +10,6 @@ index 0f0ec34..2d32560 100644
          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()
@@ -34,10 +20,8 @@ index 9c839f5..01542c2 100644
 +                   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "scfilt" ) ) ),
 +                               SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
      {
-     oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString::createFromAscii( "ScFilterCreate" ) );
+     oslGenericFunction fn = aModule.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "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() {} }
@@ -50,8 +34,6 @@ index 62ac970..b2852b9 100644
          ? 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()
@@ -64,8 +46,6 @@ index f0c6d81..1044826 100644
          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
@@ -77,22 +57,18 @@ index e1b341a..8076abd 100644
      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 ) ),
+     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 )
-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()
@@ -103,8 +79,5 @@ index d032393..f47f70b 100644
 +    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") );
+             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
      if ( fp )
--- 
-1.7.0.1
-
commit 2c33f5bba631ce160098645ff1c3a9ed80e1a330
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 13:33:01 2011 +0300

    Add some informative comments

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9e9aafb..9888e26 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -386,12 +386,15 @@ connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 
+# These hardcode the Novell name and Novell-specific artwork, should
+# not be merged.
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
-
 novell-win32-installer-branding.diff
 
-# make it possible to set file open dialog default to "details" on XP
+# Make it possible to set file open dialog default to "details" on XP.
+# This is a very special fix for just one customer, hardly something
+# LibreOffice wants in general.
 novell-win32-xp-fpicker-detail.diff, bnc#620924
 
 [ NovellWin32WritingAids ]