strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add JNI wrapper for InitUCBHelper() and call it

Browse source
This commit is contained in:
Tor Lillqvist 2012-03-28 16:42:34 +03:00
parent bb84db9f44
commit 6db50818c1
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
View file

@ -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;

2
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
View file

@ -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(

21
sal/android/lo-bootstrap.c
View file

@ -1577,6 +1577,27 @@ Java_org_libreoffice_android_Bootstrap_setCommandArgs(JNIEnv* env,
(*osl_setCommandArgs)(c_argc, c_argv);
}
// public static native void initUCBhelper();
__attribute__ ((visibility("default")))
void
Java_org_libreoffice_android_Bootstrap_initUCBHelper(JNIEnv* env,
jobject clazz)
{
void (*InitUCBHelper)(void);
(void) env;
(void) clazz;
/* This obviously should be called only after the ucbhelper so has been loaded */
InitUCBHelper = dlsym(RTLD_DEFAULT, "InitUCBHelper");
if (InitUCBHelper == NULL) {
LOGE("InitUCBHelper: InitUCBHelper not found");
return;
}
(*InitUCBHelper)();
}
__attribute__ ((visibility("default")))
JavaVM *
lo_get_javavm(void)