[Libreoffice-commits] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/dlopen-global-symbols.diff            |    2 +-
 patches/dev300/novell-win32-agfa-monotype-fonts.diff |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 80c631e7a3c652a7dd025f81d8d3d862ed11401a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Nov 1 11:41:47 2010 +0200

    Make dlopen-global-symbols.diff apply again

diff --git a/patches/dev300/dlopen-global-symbols.diff b/patches/dev300/dlopen-global-symbols.diff
index 5467201..a174e92 100644
--- a/patches/dev300/dlopen-global-symbols.diff
+++ b/patches/dev300/dlopen-global-symbols.diff
@@ -20,7 +20,7 @@ index 0f0ec34..2d32560 100644
 +    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, aStrBuf.makeStringAndClear(),
 +                                                             SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
          fp = ( ScAbstractDialogFactory* (__LOADONCALLAPI*)() )
-             aDialogLibrary.getFunctionSymbol( ::rtl::OUString::createFromAscii("CreateDialogFactory") );
+             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
commit 175c1f519eadef0fe5c422ba88b78c1eb360c695
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Nov 1 11:41:31 2010 +0200

    Make novell-win32-agfa-monotype-fonts.diff apply again

diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
index aba03a7..1ccda80 100644
--- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff
+++ b/patches/dev300/novell-win32-agfa-monotype-fonts.diff
@@ -95,18 +95,19 @@
 +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
 --- configure.in
 +++ configure.in
-@@ -100,6 +100,11 @@ AC_ARG_WITH(afms,
-                           distributions where AFM files or TrueType Fonts
+@@ -100,6 +100,12 @@ AC_ARG_WITH(afms,
                            are known to be available.
  ],,)
+ 
 +AC_ARG_WITH(agfa-monotype-fonts,
 +[  --without-agfa-monotype-fonts Remove proprietary Agfa Monotype fonts
 +                                (even if present) in the openoffice.org installation
 +                                set.
 +],,with_agfa_monotype_fonts="yes")
- AC_ARG_ENABLE(epm,
- [  --disable-epm           OO.o includes self-packaging code, that requires
-                           epm, however epm is useless for large scale
++
+ AC_ARG_WITH(epm,
+ [  --with-epm          Decides which epm to use. Default is to use
+               the one from the system if one is built. When
 @@ -6766,6 +6771,18 @@ else
  fi
  AC_SUBST(WITH_FONTS)