android/Bootstrap/Makefile.shared | 1 android/experimental/LibreOffice4Android/dummies.cxx | 31 +++++++++++++++++++ android/experimental/desktop/dummies.cxx | 30 ++++++++++++++++++ 3 files changed, 62 insertions(+)
New commits: commit 9b629f296732e8da630efe95321d9b1769b17a2f Author: Tor Lillqvist <t...@collabora.com> Date: Fri Nov 1 08:59:03 2013 +0200 Add (dummy) touch_ui_dialog_modal() implementations Change-Id: I12fde9cc7180118ade39b7a037d05e8793bd1c12 diff --git a/android/experimental/LibreOffice4Android/dummies.cxx b/android/experimental/LibreOffice4Android/dummies.cxx index 89766e8..5607ecf 100644 --- a/android/experimental/LibreOffice4Android/dummies.cxx +++ b/android/experimental/LibreOffice4Android/dummies.cxx @@ -11,6 +11,8 @@ // that the LO layer calls. As this experimental Android app doesn't // handle any of that, these do nothing. +#include <android/log.h> + #include <touch/touch.h> extern "C" @@ -41,4 +43,33 @@ touch_ui_selection_none() { } + +static const char * +dialog_kind_to_string(MLODialogKind kind) +{ + switch (kind) { + case MLODialogMessage: + return "MSG"; + case MLODialogInformation: + return "INF"; + case MLODialogWarning: + return "WRN"; + case MLODialogError: + return "ERR"; + case MLODialogQuery: + return "QRY"; + default: + return "WTF"; + } +} + +extern "C" +__attribute__ ((visibility("default"))) +MLODialogResult +touch_ui_dialog_modal(MLODialogKind kind, const char *message) +{ + __android_log_print(ANDROID_LOG_INFO, "===> %s: %s", dialog_kind_to_string(kind), message); + return MLODialogOK; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/android/experimental/desktop/dummies.cxx b/android/experimental/desktop/dummies.cxx index 89766e8..f89009a 100644 --- a/android/experimental/desktop/dummies.cxx +++ b/android/experimental/desktop/dummies.cxx @@ -11,6 +11,8 @@ // that the LO layer calls. As this experimental Android app doesn't // handle any of that, these do nothing. +#include <android/log.h> + #include <touch/touch.h> extern "C" @@ -41,4 +43,32 @@ touch_ui_selection_none() { } +static const char * +dialog_kind_to_string(MLODialogKind kind) +{ + switch (kind) { + case MLODialogMessage: + return "MSG"; + case MLODialogInformation: + return "INF"; + case MLODialogWarning: + return "WRN"; + case MLODialogError: + return "ERR"; + case MLODialogQuery: + return "QRY"; + default: + return "WTF"; + } +} + +extern "C" +__attribute__ ((visibility("default"))) +MLODialogResult +touch_ui_dialog_modal(MLODialogKind kind, const char *message) +{ + __android_log_print(ANDROID_LOG_INFO, "===> %s: %s", dialog_kind_to_string(kind), message); + return MLODialogOK; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 354c1a99ea29e41dd948600071ccc6215d77c29a Author: Tor Lillqvist <t...@collabora.com> Date: Fri Nov 1 08:58:38 2013 +0200 Add FREEHAND_LIBS Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 20d1c0c..657e433 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -83,6 +83,7 @@ LIBS = \ -Wl,--start-group \ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \ + $(FREEHAND_LIBS) \ $(HARFBUZZ_LIBS) \ $(HUNSPELL_LIBS) \ $(HYPHEN_LIB) \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits