[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/Library_oox.mk sw/inc

[René Engelhard]

 oox/Library_oox.mk |    4 ++++
 sw/inc/cellatr.hxx |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 0558807ddc938d945eda23da00d446df4ac5573a
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jan 31 21:09:48 2012 +0100

    build oox with explicit -Os on ia64 as it otherwise gets too big to link

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index f513f9b..a8244ac 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -40,6 +40,10 @@ $(eval $(call gb_Library_set_include,oox,\
     -I$(realpath $(SRCDIR)/oox/inc) \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,oox,\
+    -Os \
+))
+
 $(eval $(call gb_Library_add_defs,oox,\
     -DOOX_DLLIMPLEMENTATION \
 ))
commit 6597d4bec2a26c8cf7232e02aef5632f3b8df7c5
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jan 31 21:06:47 2012 +0100

    add explicit empty SwTblBoxFormula destructor to fix armel build...

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index e081375..c147379 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -64,6 +64,7 @@ class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
 
 public:
     SwTblBoxFormula( const String& rFormula );
+    ~SwTblBoxFormula() {};
 
     // "pure virtual methods" of SfxPoolItem
     virtual int             operator==( const SfxPoolItem& ) const;