diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-09-06 17:31:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-09-06 17:32:57 +0300 |
commit | 6dc9552e22952f83d9ee16870eae9e1f2a2ca2fa (patch) | |
tree | 8fb823b1656a108d4dbe8dc6e85b9c26bfc5192c /android | |
parent | Avoid assertion failure when rendering thumbnails of some pages (diff) | |
download | core-6dc9552e22952f83d9ee16870eae9e1f2a2ca2fa.tar.gz core-6dc9552e22952f83d9ee16870eae9e1f2a2ca2fa.zip |
Move Bootstrap setup and lib pre-loading (for easier debugging) to onCreate()
Change-Id: I77c08dc1236c4c77cfb7711f3be659ebfe877dd1
Diffstat (limited to 'android')
-rw-r--r-- | android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java index c2ce1d444d57..c0f4c4de8f56 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -135,7 +135,15 @@ public class LibreOfficeUIActivity extends SherlockActivity implements ActionBar currentDirectory = homeDirectory; //Load default settings + Bootstrap.setup(this); + Bootstrap.putenv("SAL_LOG=yes"); + + // Load a lot of shlibs here explicitly in advance because that + // makes debugging work better, sigh + Bootstrap.dlopen("libmergedlo.so"); + Bootstrap.dlopen("libswdlo.so"); + Bootstrap.dlopen("libswlo.so"); } public void createUI(){ @@ -741,16 +749,6 @@ class ListItemAdapter implements ListAdapter{ long t1 = System.currentTimeMillis(); timingOverhead = t1 - t0; - Bootstrap.setup(LibreOfficeUIActivity.this); - - Bootstrap.putenv("SAL_LOG=yes"); - - // Load a lot of shlibs here explicitly in advance because that - // makes debugging work better, sigh - Bootstrap.dlopen("libmergedlo.so"); - Bootstrap.dlopen("libswdlo.so"); - Bootstrap.dlopen("libswlo.so"); - // Log.i(TAG, "Sleeping NOW"); // Thread.sleep(20000); |