[Libreoffice-commits] core.git: android/Bootstrap desktop/source

[Andrzej Hunt]

 android/Bootstrap/src/org/libreoffice/kit/Document.java |    3 ++-
 desktop/source/lib/lokandroid.cxx                       |   11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit b7742fd8b831959d3a0865c35f61c3c8740a1fac
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date:   Sun Jul 13 08:05:00 2014 +0200

    Add getPart(s) to lokandroid too.
    
    I.e. make lokandroid match
    4d15212ef8de89a71387c00bdeb7d9a41409e467

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 27893d2..124f768 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -16,7 +16,8 @@ public class Document {
     private final long handle;
 
     public native void setPart(int part);
-    public native int getNumberOfParts();
+    public native int getPart();
+    public native int getParts();
     public native long getDocumentHeight();
     public native long getDocumentWidth();
 
diff --git a/desktop/source/lib/lokandroid.cxx 
b/desktop/source/lib/lokandroid.cxx
index 981f556..b9fa1ba 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -75,11 +75,18 @@ extern "C" SAL_JNI_EXPORT void JNICALL 
Java_org_libreoffice_kit_Document_setPart
     pDocument->pClass->setPart(pDocument, aPart);
 }
 
-extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getNumberOfParts
+extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getPart
     (JNIEnv* pEnv, jobject aObject)
 {
     LibreOfficeKitDocument* pDocument = 
getHandle<LibreOfficeKitDocument>(pEnv, aObject);
-    return (jint) pDocument->pClass->getNumberOfParts(pDocument);
+    return (jint) pDocument->pClass->getPart(pDocument);
+}
+
+extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getParts
+    (JNIEnv* pEnv, jobject aObject)
+{
+    LibreOfficeKitDocument* pDocument = 
getHandle<LibreOfficeKitDocument>(pEnv, aObject);
+    return (jint) pDocument->pClass->getParts(pDocument);
 }
 
 extern "C" SAL_JNI_EXPORT jint JNICALL 
Java_org_libreoffice_kit_Document_getDocumentTypeNative
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits