[Libreoffice-commits] .: i18npool/Library_i18nsearch.mk vcl/ios

[Libreoffice Gerrit user]

 i18npool/Library_i18nsearch.mk      |   11 +----------
 vcl/ios/source/gdi/salgdicommon.cxx |    1 +
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit ce629d95a6eadea43a3b5b4208f3965767f9fcea
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Nov 12 15:17:07 2012 +0000

    Another attempt at fixing icu linkage as externals.

diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index b74eff8..d59345e 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -38,24 +38,15 @@ $(eval $(call gb_Library_set_include,i18nsearch,\
 
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))
 
-ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Library_use_externals,i18nsearch,\
-	icuin \
-	icuuc \
-))
-else
-$(eval $(call gb_Library_use_externals,i18nsearch,\
-	icui18n \
+	$(if $(filter MSC,$(COM)),icuin,icui18n) \
 	icuuc \
 ))
-endif
 
 $(eval $(call gb_Library_use_libraries,i18nsearch,\
 	comphelper \
 	cppu \
 	cppuhelper \
-	icuuc \
-	$(if $(filter MSC,$(COM)),icuin,icui18n) \
 	sal \
 	$(gb_UWINAPI) \
 ))
diff --git a/vcl/ios/source/gdi/salgdicommon.cxx b/vcl/ios/source/gdi/salgdicommon.cxx
index 3e982b8..0b960da 100644
--- a/vcl/ios/source/gdi/salgdicommon.cxx
+++ b/vcl/ios/source/gdi/salgdicommon.cxx
@@ -685,6 +685,7 @@ bool IosSalGraphics::drawPolyLine(
     {
         return false;
     }
+
     // setup line attributes
     CGLineJoin aCGLineJoin = kCGLineJoinMiter;
     switch( eLineJoin )