diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-03-24 11:28:21 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-03-24 15:30:27 +0200 |
commit | 4cc1bcbaedd483482240f0ffbf42e56dd6052612 (patch) | |
tree | 81ddf9b524118b6b6338b8642c17939ab890a65c /android | |
parent | 38c22ed2b8b8f3530b8a0fe5a23a329e8e511c76 (diff) |
Kill dead <touch/touch.h> API
Has all been obsoleted by LibreOfficeKit.
Only some MOBILE_* constant #defines are now left in touch.h, but probably
those are used only by dead code.
Change-Id: I646945c4408b4e6cd5510da535cfc12088dd391c
Diffstat (limited to 'android')
-rw-r--r-- | android/Bootstrap/Makefile.shared | 4 | ||||
-rw-r--r-- | android/experimental/LOAndroid3/dummies.cxx | 75 | ||||
-rw-r--r-- | android/experimental/desktop/dummies.cxx | 74 |
3 files changed, 2 insertions, 151 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 5020773b40e2..93298e915002 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -98,9 +98,9 @@ WHOLELIBS = \ -Wl,--no-whole-archive -$(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx $(ALL_STATIC_LIBS) +$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS) mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) diff --git a/android/experimental/LOAndroid3/dummies.cxx b/android/experimental/LOAndroid3/dummies.cxx deleted file mode 100644 index 5607ecfd72d6..000000000000 --- a/android/experimental/LOAndroid3/dummies.cxx +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -// Dummy implementations of the callback functions in the UI layer -// 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" -__attribute__ ((visibility("default"))) -void -touch_ui_selection_start(MLOSelectionKind kind, - const void *documentHandle, - MLORect *rectangles, - int rectangleCount, - void *preview) -{ -} - -extern "C" -__attribute__ ((visibility("default"))) -void -touch_ui_selection_resize_done(bool success, - const void *documentHandle, - MLORect *rectangles, - int rectangleCount) -{ -} - -extern "C" -__attribute__ ((visibility("default"))) -void -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 deleted file mode 100644 index f89009a317be..000000000000 --- a/android/experimental/desktop/dummies.cxx +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -// Dummy implementations of the callback functions in the UI layer -// 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" -__attribute__ ((visibility("default"))) -void -touch_ui_selection_start(MLOSelectionKind kind, - const void *documentHandle, - MLORect *rectangles, - int rectangleCount, - void *preview) -{ -} - -extern "C" -__attribute__ ((visibility("default"))) -void -touch_ui_selection_resize_done(bool success, - const void *documentHandle, - MLORect *rectangles, - int rectangleCount) -{ -} - -extern "C" -__attribute__ ((visibility("default"))) -void -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: */ |