[Libreoffice-commits] .: 2 commits - android/experimental i18npool/source

Tor Lillqvist tml at kemper.freedesktop.org
Thu Aug 9 11:51:43 PDT 2012


 android/experimental/LibreOffice4Android/Makefile |    1 +
 i18npool/source/languagetag/simple-langtag.cxx    |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b57899ae39192f8f5edeba99808376612ffc48dd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 9 21:42:10 2012 +0300

    Mkdir before copying
    
    Change-Id: I8e1a3c62bee096252acb04d7be100caaac25a87c

diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 18eba3e..1365407 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -225,6 +225,7 @@ build-ant: copy-stuff properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties
 # ActionBarSherlock uses the v4 support library, apparently one needs to copy
 # it like this for it to be found
+	mkdir -p ../../abs-lib/libs
 	cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../../abs-lib/libs
 #
 # Copy jar files we need
commit 705ba19317b8a80df521ba02789cf17efa4a2460
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 9 18:13:24 2012 +0300

    WaE: unused function
    
    Change-Id: I292de75fbc5dd83bfeefc242e8ac699ab7b6fad8

diff --git a/i18npool/source/languagetag/simple-langtag.cxx b/i18npool/source/languagetag/simple-langtag.cxx
index 7131749..7fd735e 100644
--- a/i18npool/source/languagetag/simple-langtag.cxx
+++ b/i18npool/source/languagetag/simple-langtag.cxx
@@ -387,6 +387,7 @@ static const gchar *lt_region_get_tag(const lt_region_t *region)
     return region ? region->mpStr : NULL;
 }
 
+#ifdef erDEBUG
 static void lt_tag_dump(const lt_tag_t *tag)
 {
     fprintf( stderr, "\n");
@@ -395,7 +396,7 @@ static void lt_tag_dump(const lt_tag_t *tag)
     fprintf( stderr, "SimpleLangtag   script: %s\n", tag->maScript.mpStr);
     fprintf( stderr, "SimpleLangtag   region: %s\n", tag->maRegion.mpStr);
 }
-
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list