[Libreoffice-commits] .: 2 commits - moz/seamonkey-source-1.1.14.patch oox/source

[Libreoffice Gerrit user]

 moz/seamonkey-source-1.1.14.patch              |   10 +++++++++-
 oox/source/drawingml/table/tableproperties.cxx |    2 --
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 78d8557aab0046d51d1ee09d11164248dd1d1391
Author: Jung-uk Kim <jkim at FreeBSD.org>
Date:   Thu Aug 30 09:31:42 2012 +0200

    fdo#54015: At least FreeBSD ld requires -z origin, moz redux
    
    Change-Id: Ide36957d1826f5ac20b14a6919abfc684c33cb9c

diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index a23bcaa..1d0db1f 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -5876,7 +5876,15 @@
  #endif
 --- misc/mozilla/security/coreconf/FreeBSD.mk	2006-12-22 14:48:06.000000000 +0100
 +++ misc/build/mozilla/security/coreconf/FreeBSD.mk	2008-08-14 16:22:21.000000000 +0200
-@@ -65,7 +65,7 @@
+@@ -52,6 +52,7 @@
+ 
+ DSO_CFLAGS		= -fPIC
+ DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS		+= -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+ 
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
+@@ -65,7 +66,7 @@
  
  ARCH			= freebsd
  
commit 18f08e53d8ca0df16485159bd72eaa404368ff38
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 30 09:31:10 2012 +0200

    -Werror,-Wunused-value (Clang towards 3.2)
    
    Change-Id: I24bf5a91544269e9284c52aedca1fcd8435a8e4a

diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 29b5db5..e76108b 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -132,8 +132,6 @@ const TableStyle& TableProperties::getUsedTableStyle( const ::oox::core::XmlFilt
 void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
     const Reference < XPropertySet >& xPropSet, TextListStylePtr pMasterTextListStyle )
 {
-    TableStyleListPtr( const_cast< ::oox::core::XmlFilterBase& >( rFilterBase ).getTableStyles() );
-
     uno::Reference< XColumnRowRange > xColumnRowRange(
          xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ), uno::UNO_QUERY_THROW );