[Libreoffice-commits] core.git: 3 commits - ios/Executable_LibreOffice.mk svgio/inc svgio/source touch/Library_libotouch.mk touch/Module_touch.mk

[Tor Lillqvist]

 ios/Executable_LibreOffice.mk                    |    2 ++
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |    2 +-
 svgio/source/svgreader/svgstyleattributes.cxx    |    2 +-
 touch/Library_libotouch.mk                       |    9 ---------
 touch/Module_touch.mk                            |    7 ++++---
 5 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 9bc0ca091b7037f7c8f4782103a81b7287bc1de3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 14 20:40:58 2013 +0300

    WaE: type qualifiers ignored on function return type
    
    Change-Id: I40d946b1e3ba104e8b8acac53ccf7296f6ee78fc

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 4e0c1ac..fe290ae 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -315,7 +315,7 @@ namespace svgio
             void setFillOpacity(const SvgNumber& rFillOpacity = SvgNumber()) { maFillOpacity = rFillOpacity; }
 
             /// fill rule content
-            const FillRule getFillRule() const;
+            FillRule getFillRule() const;
             void setFillRule(const FillRule aFillRule = FillRule_notset) { maFillRule = aFillRule; }
 
             /// fill StrokeDasharray content
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 0787490..140107f 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2006,7 +2006,7 @@ namespace svgio
             return SvgNumber(1.0);
         }
 
-        const FillRule SvgStyleAttributes::getFillRule() const
+        FillRule SvgStyleAttributes::getFillRule() const
         {
             if(FillRule_notset != maFillRule)
             {
commit 03a9ec4aa5a795b86fa626de1bf23196d7375f50
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 14 18:55:55 2013 +0300

    Don't bother with unused stuff
    
    Also, install the header files on all platforms.
    
    Change-Id: I06820416956a6b35ff327d8871f7d4adf16ef15b

diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk
index 7e26f3d..cd0a14c 100644
--- a/touch/Library_libotouch.mk
+++ b/touch/Library_libotouch.mk
@@ -14,16 +14,7 @@ $(eval $(call gb_Library_set_include,libotouch,\
 ))
 
 $(eval $(call gb_Library_use_sdk_api,libotouch))
-
-$(eval $(call gb_Library_use_internal_comprehensive_api,libotouch,\
-	touch \
-))
-
-$(eval $(call gb_Library_use_libraries,libotouch,\
-))
-
 $(eval $(call gb_Library_add_exception_objects,libotouch,\
-	touch/source/uno/Document \
 	touch/source/generic/libotouch \
 ))
 
diff --git a/touch/Module_touch.mk b/touch/Module_touch.mk
index fde090d..b2857a9 100644
--- a/touch/Module_touch.mk
+++ b/touch/Module_touch.mk
@@ -11,12 +11,13 @@ $(eval $(call gb_Module_Module,touch))
 ifneq (,$(filter IOS ANDROID,$(OS)))
 
 $(eval $(call gb_Module_add_targets,touch,\
-	CustomTarget_touch_javamaker \
-	InternalUnoApi_touch \
 	Library_libotouch \
-	Package_inc \
 ))
 
 endif
 
+$(eval $(call gb_Module_add_targets,touch,\
+	Package_inc \
+))
+
 # vim: set noet sw=4 ts=4:
commit b0e6bba1c5892574c5531fa2d2b0a5797f3ef053
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Apr 14 18:55:08 2013 +0300

    Try depending on touch_inc to maybe fix tinderbox build
    
    Change-Id: I9833437256243c26b9ff468937ec9f975c2e898d

diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index f4daea8..8e4e0e1 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
     ios/experimental/LibreOffice/LibreOffice/ViewController \
 ))
 
+$(call gb_Executable_use_package,LibreOffice,touch_inc)
+
 $(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 
 # Mark the executable as depending on all libraries so that it gets