diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-03-30 10:24:53 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-03-30 16:01:38 +0300 |
commit | 3d177c7b6dae0af7d2e4822b3812757c9f65a0c3 (patch) | |
tree | de3250107b0a715ef2926df9bfa9ca89c0f44f80 | |
parent | 2688a8829771289d576415a9b933a1c30197cf01 (diff) |
Bootstrap.initVCL is not used by our Android app any more
Change-Id: Id1e58547cf2b0786d7a2ca29eae8bbcdd644fdd5
-rw-r--r-- | android/Bootstrap/src/org/libreoffice/android/Bootstrap.java | 4 | ||||
-rw-r--r-- | sal/android/lo-bootstrap.c | 15 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 17 |
3 files changed, 0 insertions, 36 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 146ced09f4b0..ca7d48b0cc27 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -43,10 +43,6 @@ public final class Bootstrap // Wrapper for putenv() public static native void putenv(String string); - // A wrapper for InitVCL() in libvcl (svmain.cxx), called indirectly - // through the lo-bootstrap library - public static native void initVCL(); - // A wrapper for osl_setCommandArgs(). Before calling // osl_setCommandArgs(), argv[0] is prefixed with the parent directory of // where the lo-bootstrap library is. diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index 4d318e86d772..5c47b8f6bd2f 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -821,21 +821,6 @@ extract_files(const char *root, * functions here in this file. */ -// public static native void initVCL(); - -extern void InitVCLWrapper(void); - -__attribute__ ((visibility("default"))) -void -Java_org_libreoffice_android_Bootstrap_initVCL(JNIEnv* env, - jobject clazz) -{ - (void) env; - (void) clazz; - - InitVCLWrapper(); -} - extern void osl_setCommandArgs(int, char **); __attribute__ ((visibility("default"))) diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 360dc6a3f8fd..a80d576c1987 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -294,23 +294,6 @@ bool InitVCL() return true; } -#ifdef ANDROID - -extern "C" __attribute__ ((visibility("default"))) void -InitVCLWrapper() -{ - uno::Reference<uno::XComponentContext> xContext( cppu::defaultBootstrap_InitialComponentContext() ); - uno::Reference<lang::XMultiComponentFactory> xFactory( xContext->getServiceManager() ); - - uno::Reference<lang::XMultiServiceFactory> xSM( xFactory, uno::UNO_QUERY_THROW ); - - comphelper::setProcessServiceFactory( xSM ); - - InitVCL(); -} - -#endif - namespace { |