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

[Tor Lillqvist]

 patches/dev300/link-as-needed.diff               |    4 ++--
 patches/dev300/speed-hash-style.diff             |    4 ++--
 patches/dev300/warning-return-values-filter.diff |    7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit c7a5123bee3bd9623b5b9564c3f658c2a72bd08f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Nov 25 14:38:33 2010 +0200

    Make warning-return-values-filter.diff apply again

diff --git a/patches/dev300/warning-return-values-filter.diff b/patches/dev300/warning-return-values-filter.diff
index 020be4f..02c143a 100644
--- a/patches/dev300/warning-return-values-filter.diff
+++ b/patches/dev300/warning-return-values-filter.diff
@@ -10,17 +10,14 @@ index c2ea190..657e8ad 100644
          case E_CONTENTHANDLER : return m_lContentHandlers;
          case E_DETECTSERVICE  : return m_lDetectServices ;
  
--        default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unknown sub container requested."),
+-        default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
 -                                            css::uno::Reference< css::uno::XInterface >()                      );
      }
  
 +    // throw has been moved from the default section of the switch to
 +    // avoid warning: control reaches end of non-void function
-+    throw css::uno::Exception(::rtl::OUString::createFromAscii("unknown sub container requested."),
++    throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
 +                                            css::uno::Reference< css::uno::XInterface >()                      );
      // <- SAFE ----------------------------------
  }
  
--- 
-1.7.0.1
-
commit 584c4d3b844177c746c53ec0793daf16754f39db
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Nov 18 19:45:35 2010 +0200

    Make link-as-needed.diff apply again
    
    Stuff has moved from unxlng.mk to unxgcc.mk.

diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff
index d76a9f1..35633b5 100644
--- a/patches/dev300/link-as-needed.diff
+++ b/patches/dev300/link-as-needed.diff
@@ -96,8 +96,8 @@
  
  # linker flags for linking applications
  LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
---- solenv/inc/unxlng.mk.old	2010-07-29 16:48:44.000000000 +0200
-+++ solenv/inc/unxlng.mk	2010-07-29 16:50:30.000000000 +0200
+--- solenv/inc/unxgcc.mk
++++ solenv/inc/unxgcc.mk
 @@ -158,6 +158,9 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,comb
  .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
  LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
commit 3be8e18be28425f56298e7493e3ddd61fe60d080
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Nov 18 19:43:21 2010 +0200

    Make speed-hash-style.diff apply again
    
    Stuff has moved from unxlng.mk to unxgcc.mk.

diff --git a/patches/dev300/speed-hash-style.diff b/patches/dev300/speed-hash-style.diff
index 6ee1215..51c0aba 100644
--- a/patches/dev300/speed-hash-style.diff
+++ b/patches/dev300/speed-hash-style.diff
@@ -41,8 +41,8 @@
  ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
  		"@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
  ToFile( "CXX",               $CXX,               "e" );
---- solenv/inc/unxlng.mk.old	2010-07-29 14:46:23.000000000 +0200
-+++ solenv/inc/unxlng.mk	2010-07-29 16:48:44.000000000 +0200
+--- solenv/inc/unxgcc.mk
++++ solenv/inc/unxgcc.mk
 @@ -207,7 +207,7 @@ STDSHLCUIMT+=-ljemalloc
  .ENDIF