Kaydet (Commit) 3d177c7b authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Bootstrap.initVCL is not used by our Android app any more

Change-Id: Id1e58547cf2b0786d7a2ca29eae8bbcdd644fdd5
üst 2688a882
......@@ -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.
......
......@@ -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")))
......
......@@ -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
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment