[Libreoffice-commits] core.git: 3 commits - ios/CustomTarget_TiledLibreOffice_app.mk solenv/gbuild sw/source

[Tor Lillqvist]

 ios/CustomTarget_TiledLibreOffice_app.mk |    6 ++++++
 solenv/gbuild/platform/IOS_ARM_GCC.mk    |    2 +-
 sw/source/core/layout/paintfrm.cxx       |   20 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit d7aef2407a0d9e8ff3bf72e198feb55a71307733
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 18 15:07:41 2014 +0300

    Add silly workaround for weird Clang (Xcode 5.1.1) problem with -Oz
    
    Change-Id: I4fc5997504d3fb847518317abd5bf80fda4467d5

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index c975039..5e70d16 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -162,6 +162,14 @@ public:
     bool MakeUnion( const SwRect &rRect );
 };
 
+#ifdef IOS
+static void dummy_function()
+{
+    pid_t pid = getpid();
+    (void) pid;
+}
+#endif
+
 class SwLineRects
 {
 public:
@@ -171,7 +179,17 @@ public:
     typedef std::vector< SwLineRect >::reverse_iterator reverse_iterator;
     typedef std::vector< SwLineRect >::size_type size_type;
     size_t nLastCount;  //avoid unnecessary cycles in PaintLines
-    SwLineRects() : nLastCount( 0 ) {}
+    SwLineRects() : nLastCount( 0 )
+    {
+#ifdef IOS
+        // Work around what is either a compiler bug in Xcode 5.1.1,
+        // or some unknown problem in this file. If I ifdef out this
+        // call, I get a crash in SwSubsRects::PaintSubsidiary: the
+        // address of the rLi reference variable is claimed to be
+        // 0x4000000!
+        dummy_function();
+#endif
+    }
     void AddLineRect( const SwRect& rRect,  const Color *pColor, const SvxBorderStyle nStyle,
                       const SwTabFrm *pTab, const sal_uInt8 nSCol );
     void ConnectEdges( OutputDevice *pOut );
commit 37466b015d549b630e3965e371cde5c9dbe4a45e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 18 15:06:09 2014 +0300

    Include the newly required custom shape data files
    
    Change-Id: I3a83be864819a0dea98263ca399789ffd007f405

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 618b4cc..5ca37a9 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -62,6 +62,12 @@ TiledLibreOffice_setup:
 	# Japanese and Chinese dict files
 	cp $(WORKDIR)/CustomTarget/i18npool/breakiterator/dict_*.data $(TiledLibreOffice_resource)/share
 
+	# Drawing ML custom shape data files
+	mkdir -p $(TiledLibreOffice_resource)/share/filter
+	cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(TiledLibreOffice_resource)/share/filter
+	cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(TiledLibreOffice_resource)/share/filter
+	cp $(INSTDIR)/share/filter/vml-shape-types $(TiledLibreOffice_resource)/share/filter
+
 	# "registry"
 	cp -R $(INSTDIR)/share/registry $(TiledLibreOffice_resource)/share
 
commit 634979bb51163f072e09a1cbc7fd9b414f02e1e3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 18 15:03:42 2014 +0300

    Let's try to use -Oz after all
    
    It gives such substantial code space savings. We will just have to
    work around the few problems it seems to cause.
    
    Change-Id: I31031dfea049c7d28624c76ec8999976d9383df6

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index a85a4b6..27659c4 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -26,7 +26,7 @@ ifeq ($(CXX),)
 $(error You must set CXX in the environment. See README.cross for example.)
 endif
 
-gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_COMPILERDEFAULTOPTFLAGS := -Oz
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk