diff options
Diffstat (limited to 'android/experimental')
| -rw-r--r-- | android/experimental/LOAndroid3/Makefile | 2 | ||||
| -rw-r--r-- | android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile index 4db011f13616..5169b2d4eb35 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/experimental/LOAndroid3/Makefile @@ -13,7 +13,7 @@ BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py - $< -g core -g writer > $@ + $< -j -g core -g writer > $@ copy-stuff: # Then "assets". Let the directory structure under assets mimic diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java index d4758443bf13..3d30dcc8e80e 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -16,7 +16,7 @@ import org.mozilla.gecko.gfx.GeckoSoftwareLayerClient; import org.mozilla.gecko.gfx.LayerController; import org.mozilla.gecko.gfx.LayerView; -import org.libreoffice.android.Bootstrap; +import org.libreoffice.android.LibreOfficeKit; import com.sun.star.frame.XComponentLoader; import com.sun.star.lang.XMultiComponentFactory; @@ -74,18 +74,19 @@ public class LibreOfficeMainActivity extends Activity { super.onCreate(savedInstanceState); try { - Bootstrap.setup(this); - Bootstrap.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl"); + LibreOfficeKit.init(this); + LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl"); setContentView(R.layout.activity_main); Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - onCreate"); + /* String input = "/assets/test1.odt"; String[] argv = { "lo-document-loader", input }; - Bootstrap.setCommandArgs(argv); + LibreOfficeKit.setCommandArgs(argv); Bootstrap.initVCL(); @@ -102,7 +103,7 @@ public class LibreOfficeMainActivity extends Activity { componentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, desktop); Log.i(LOGTAG, "componentLoader is" + (componentLoader!=null ? " not" : "") + " null"); - + */ } catch (Exception e) { e.printStackTrace(System.err); //finish(); @@ -143,3 +144,5 @@ public class LibreOfficeMainActivity extends Activity { return mLayerController; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |