summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-03-28 16:42:34 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-03-28 16:57:59 +0300
commit6db50818c1f6685adc4551c6927c9420f0872775 (patch)
tree2f5540f13a224fa496270f8617e9572c47ffd67a /android
parentbb84db9f44fd1fcadd86841411ac40d22281c157 (diff)
Add JNI wrapper for InitUCBHelper() and call it
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/src/org/libreoffice/android/Bootstrap.java4
-rw-r--r--android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java2
2 files changed, 6 insertions, 0 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index e5f2f1e2acfc..c60c9e975a64 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -93,6 +93,10 @@ public class Bootstrap extends NativeActivity
// where the lo-bootstrap library is.
public static native void setCommandArgs(String[] argv);
+ // A wrapper for InitUCBHelper() in he ucbhelper library
+ // (contentbroker.cxx), also this called indirectly through the lo-bootstrap library
+ public static native void initUCBHelper();
+
public static void setup(Activity activity)
{
String dataDir = null;
diff --git a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 882c73c8a02a..93ed87e26cfd 100644
--- a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -91,6 +91,8 @@ public class DocumentLoader
Log.i(TAG, "oDesktop is" + (oDesktop!=null ? " not" : "") + " null");
+ Bootstrap.initUCBHelper();
+
com.sun.star.frame.XComponentLoader xCompLoader =
(com.sun.star.frame.XComponentLoader)
UnoRuntime.queryInterface(