[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java |   38 ----------
 1 file changed, 3 insertions(+), 35 deletions(-)

New commits:
commit 70e8c341af0c6c6f2568a75326b6ee1d3df8145a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Mar 3 23:35:01 2013 +0200

    Android "desktop" app: Simplify bootstrapping on the Java side
    
    No need to call defaultBootstrap_InitialComponentContext() etc on the Java
    side in this app. The full SVMain() etc will do all that anyway.
    
    Change-Id: I555ccd8efbd0260a72fa5904bb6dcd255eed37d4

diff --git a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index baa36dc..8b46be7 100644
--- a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++ b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -33,8 +33,6 @@ import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import com.sun.star.awt.Key;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.uno.XComponentContext;
 
 import org.libreoffice.android.Bootstrap;
 
@@ -59,47 +57,17 @@ public class Desktop
      */
     class BootstrapContext
     {
-        public long timingOverhead;
-        public XComponentContext componentContext;
-        public XMultiComponentFactory mcf;
     }
 
     BootstrapContext bootstrapContext;
-    Bundle extras;
-
-    // FIXME: we should prolly manage a bitmap buffer here and give it to
-    // VCL to render into ... and pull the WM/stacking pieces up into the Java ...
-    // [ perhaps ;-]
-    // how can we get an event to "create a window" - need a JNI callback I guess ...
 
     private void initBootstrapContext()
     {
-        try
-        {
-            bootstrapContext = new BootstrapContext();
-
-            long t0 = System.currentTimeMillis();
-            long t1 = System.currentTimeMillis();
-            bootstrapContext.timingOverhead = t1 - t0;
-
-            Bootstrap.setup(this);
-
-            // Avoid all the old style OSL_TRACE calls especially in vcl
-            Bootstrap.putenv("SAL_LOG=+WARN+INFO");
-
-            bootstrapContext.componentContext = com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
+        bootstrapContext = new BootstrapContext();
 
-            Log.i(TAG, "context is" + (bootstrapContext.componentContext!=null ? " not" : "") + " null");
+        Bootstrap.setup(this);
 
-            bootstrapContext.mcf = bootstrapContext.componentContext.getServiceManager();
-
-            Log.i(TAG, "mcf is" + (bootstrapContext.mcf!=null ? " not" : "") + " null");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace(System.err);
-            finish();
-        }
+        Bootstrap.putenv("SAL_LOG=+WARN+INFO");
     }
 
     @Override public void onCreate(Bundle savedInstanceState)