summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-02-12 17:14:13 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-16 09:20:50 +0100
commit1eb2de90bee8a0585655573eaebcc901495edd4d (patch)
tree946e87846969f3999c660c0a30a9f9789f40ebf2
parent63ae4c065122f5d44a0dfe8fcfa0cddcb14bca66 (diff)
android: add support for text selection to JNI
Change-Id: Ifa307eb6a8cb031bdd88b9fadae42c8a0811772b
-rw-r--r--android/Bootstrap/src/org/libreoffice/kit/Document.java18
-rw-r--r--desktop/source/lib/lokandroid.cxx7
2 files changed, 25 insertions, 0 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index cb798b52f2fa..ca2f38c4ab0c 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -38,6 +38,16 @@ public class Document {
*/
public static final int CALLBACK_INVALIDATE_TILES = 0;
public static final int CALLBACK_INVALIDATE_VISIBLE_CURSOR = 1;
+ public static final int CALLBACK_INVALIDATE_TEXT_SELECTION = 2;
+ public static final int CALLBACK_INVALIDATE_TEXT_SELECTION_START = 3;
+ public static final int CALLBACK_INVALIDATE_TEXT_SELECTION_END = 4;
+
+ /**
+ * Text selection types
+ */
+ public static final int TEXT_SELECTION_START = 0;
+ public static final int TEXT_SELECTION_END = 1;
+ public static final int TEXT_SELECTION_RESET = 2;
private final ByteBuffer handle;
private MessageCallback messageCallback = null;
@@ -108,6 +118,14 @@ public class Document {
public native void postMouseEvent(int type, int x, int y, int count);
/**
+ * Change text selection
+ * @param type - text selection type
+ * @param x - x coordinate
+ * @param y - y coordinate
+ */
+ public native void setTextSelection(int type, int x, int y);
+
+ /**
* Callback to retrieve messages from LOK
*/
public interface MessageCallback {
diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx
index d253cfe37bcc..5403ea0544ad 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -284,6 +284,13 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_postMou
pDocument->pClass->postMouseEvent(pDocument, type, x, y, count);
}
+extern "C" SAL_JNI_EXPORT void JNICALL Java_org_libreoffice_kit_Document_setTextSelection
+ (JNIEnv* pEnv, jobject aObject, jint type, jint x, jint y)
+{
+ LibreOfficeKitDocument* pDocument = getHandle<LibreOfficeKitDocument>(pEnv, aObject);
+ pDocument->pClass->setTextSelection(pDocument, type, x, y);
+}
+
/* DirectBufferAllocator */
extern "C" SAL_JNI_EXPORT jobject JNICALL Java_org_libreoffice_kit_DirectBufferAllocator_allocateDirectBufferNative