[Libreoffice-commits] core.git: 2 commits - include/sal odk/Package_odk_headers.mk Repository.mk RepositoryModule_host.mk toolkit/Library_tk.mk touch/Library_libotouch.mk touch/Makefile touch/Module_touch.mk touch/README touch/source
Tor Lillqvist
tml at collabora.com
Thu Dec 18 03:02:06 PST 2014
Repository.mk | 1
RepositoryModule_host.mk | 1
include/sal/ByteBufferWrapper.hxx | 40 -----------------------------
odk/Package_odk_headers.mk | 1
toolkit/Library_tk.mk | 6 ----
touch/Library_libotouch.mk | 28 --------------------
touch/Makefile | 7 -----
touch/Module_touch.mk | 22 ----------------
touch/README | 22 ----------------
touch/source/android/android.cxx | 50 -------------------------------------
touch/source/generic/libotouch.cxx | 11 --------
11 files changed, 189 deletions(-)
New commits:
commit a2e4be6ded508030a6c2a33919cbe8cb504382e0
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 18 12:04:22 2014 +0200
The touch module, ByteBufferWrapper, and the libotouch library can go away now
Change-Id: I6f4a6679c263ac81d1cf5c66f18782e857da5ff8
diff --git a/Repository.mk b/Repository.mk
index 58fee03..8b4e62e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -201,7 +201,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
- libotouch \
))
endif
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index f6a9c6e..0a9f428 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
testtools \
toolkit \
tools \
- touch \
tubes \
ucb \
ucbhelper \
diff --git a/include/sal/ByteBufferWrapper.hxx b/include/sal/ByteBufferWrapper.hxx
deleted file mode 100644
index d90fec5..0000000
--- a/include/sal/ByteBufferWrapper.hxx
+++ /dev/null
@@ -1,40 +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/.
- */
-
-#ifndef INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX
-#define INCLUDED_SAL_BYTEBUFFERWRAPPER_HXX
-
-#ifdef ANDROID
-
-#include <jni.h>
-
-#include <sal/types.h>
-
-namespace org { namespace libreoffice { namespace touch {
-
-class ByteBufferWrapper
-{
-private:
- jobject object;
-
-public:
- ByteBufferWrapper(JNIEnv *env, jobject o);
-
- sal_uInt8* pointer();
-
- void operator()(sal_uInt8 *p);
-};
-
-}; }; };
-
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk
index 0154e3a..4618fcc 100644
--- a/odk/Package_odk_headers.mk
+++ b/odk/Package_odk_headers.mk
@@ -151,7 +151,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\
rtl/ustring.h \
rtl/ustring.hxx \
rtl/uuid.h \
- sal/ByteBufferWrapper.hxx \
sal/alloca.h \
sal/config.h \
sal/detail/log.h \
diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk
deleted file mode 100644
index 1d6b289..0000000
--- a/touch/Library_libotouch.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-
-$(eval $(call gb_Library_Library,libotouch))
-
-$(eval $(call gb_Library_use_sdk_api,libotouch))
-$(eval $(call gb_Library_add_exception_objects,libotouch,\
- touch/source/generic/libotouch \
-))
-
-ifeq ($(OS),ANDROID)
-
-$(eval $(call gb_Library_use_libraries,libotouch,\
- lo-bootstrap \
-))
-
-$(eval $(call gb_Library_add_exception_objects,libotouch,\
- touch/source/android/android \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/Makefile b/touch/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/touch/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/Module_touch.mk b/touch/Module_touch.mk
deleted file mode 100644
index 10e84fd..0000000
--- a/touch/Module_touch.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-
-$(eval $(call gb_Module_Module,touch))
-
-ifneq (,$(filter IOS ANDROID,$(OS)))
-
-$(eval $(call gb_Module_add_targets,touch,\
- Library_libotouch \
-))
-
-endif
-
-$(eval $(call gb_Module_add_targets,touch,\
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/touch/README b/touch/README
deleted file mode 100644
index 7f05bd2..0000000
--- a/touch/README
+++ /dev/null
@@ -1,22 +0,0 @@
-Library that provides API used by LO-based apps on touch devices
-
-This is all very much a work in progress and the design can change
-radically at any moment. And actually at the moment it is unclear
-whether this will be used or not.
-
-The name "touch" for this module and the library name "libotouch" are
-not fixed and might change if somebody comes up with niftier names.
-
-This module will contain an UNO API to be called either from Java (for
-Android), or directly (iOS). (Or, on iOS, possibly through some thin
-Objective-C layer to hide the UNO.)
-
-The API will provide a mechanism to render "tiles" of a document at some
-requested zoom level. Initially for viewer style apps, but the work should
-ideally be open-ended to potentially be a base for editing apps, too.
-
-For starters, concentrating on text ("Writer") documents as they are
-easiest. With spreadsheets come the added complexity of the cell grid being
-potentially unbounded and no clear "page" area. With presentations come the
-animation complications, and possibly LO-based viewer apps for presentations
-will be done in a totally different fashion.
diff --git a/touch/source/android/android.cxx b/touch/source/android/android.cxx
deleted file mode 100644
index bb86f0b..0000000
--- a/touch/source/android/android.cxx
+++ /dev/null
@@ -1,50 +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/.
- */
-
-#include <jni.h>
-
-#include <sal/ByteBufferWrapper.hxx>
-#include <osl/detail/android-bootstrap.h>
-
-using org::libreoffice::touch::ByteBufferWrapper;
-
-static JNIEnv *get_env()
-{
- JavaVMAttachArgs args = {
- JNI_VERSION_1_2,
- NULL,
- NULL
- };
-
- JavaVM *jvm = lo_get_javavm();
- JNIEnv *env = NULL;
-
- jvm->AttachCurrentThread(&env, &args);
- return env;
-}
-
-__attribute__ ((visibility("default")))
-ByteBufferWrapper::ByteBufferWrapper(JNIEnv *env, jobject o)
-{
- object = env->NewGlobalRef(o);
-}
-
-__attribute__ ((visibility("default")))
-sal_uInt8* ByteBufferWrapper::pointer()
-{
- return (sal_uInt8 *) get_env()->GetDirectBufferAddress(object);
-}
-
-__attribute__ ((visibility("default")))
-void ByteBufferWrapper::operator()(sal_uInt8 * /* p */)
-{
- get_env()->DeleteGlobalRef(object);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/touch/source/generic/libotouch.cxx b/touch/source/generic/libotouch.cxx
deleted file mode 100644
index ab96dca..0000000
--- a/touch/source/generic/libotouch.cxx
+++ /dev/null
@@ -1,11 +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/.
- */
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a6467341d19f30100afdca66574d925a10fdf911
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 18 12:04:04 2014 +0200
No need for libotouch any more here
Change-Id: Ie092b9475e5dbf8d16bc8b02128c3a6858643abd
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 5a219e0..31ea037 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -126,10 +126,4 @@ $(eval $(call gb_Library_add_cxxflags,tk,\
$(gb_OBJCXXFLAGS)))
endif
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,tk,\
- libotouch \
-))
-endif
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list