diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-09-19 18:38:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-19 18:41:45 +0100 |
| commit | e989d167485e1e15d0aedef600ee450f01382382 (patch) | |
| tree | a336a2cbe260c7fed5e36104db1be225cb98b881 /android | |
| parent | a48d072f5c022fce4f5eec7bca3139c3673dbf49 (diff) | |
dung out no longer needed initUCBHelper methods; thanks to sberg.
Diffstat (limited to 'android')
4 files changed, 1 insertions, 11 deletions
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java index 8c635d479408..b97adfb6261a 100644 --- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java +++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java @@ -98,10 +98,6 @@ public class Bootstrap extends NativeActivity // where the lo-bootstrap library is. public static native void setCommandArgs(String[] argv); - // A wrapper for InitUCBHelper() in the ucbhelper library - // (contentbroker.cxx), also this called indirectly through the lo-bootstrap library - public static native void initUCBHelper(); - // A wrapper for createWindowFoo() in the vcl library public static native int createWindowFoo(); diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java index 39a8f016efa3..638c9b950a05 100644 --- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java +++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java @@ -968,8 +968,6 @@ public class DocumentLoader Log.i(TAG, "desktop is" + (desktop!=null ? " not" : "") + " null"); - Bootstrap.initUCBHelper(); - componentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, desktop); Log.i(TAG, "componentLoader is" + (componentLoader!=null ? " not" : "") + " null"); diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java index 9f9790cf2d9f..5fc3fad2a950 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java @@ -998,8 +998,6 @@ public class DocumentLoader Log.i(TAG, "desktop is" + (desktop!=null ? " not" : "") + " null"); - Bootstrap.initUCBHelper(); - componentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, desktop); Log.i(TAG, "componentLoader is" + (componentLoader!=null ? " not" : "") + " null"); @@ -1021,7 +1019,7 @@ public class DocumentLoader flipper.addView(new PageViewer(i+1), i+1, matchParent); for (int i = 0; i < PAGECACHE_PLUSMINUS; i++) flipper.addView(new PageViewer(-1), PAGECACHE_PLUSMINUS + i+1, matchParent); - + ll = (LinearLayout)findViewById( R.id.navigator); inflater = (LayoutInflater) getApplicationContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE); diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java index c0f4c4de8f56..70ca6f6cf71a 100644 --- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java +++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java @@ -776,8 +776,6 @@ class ListItemAdapter implements ListAdapter{ Log.i(TAG, "desktop is" + (desktop!=null ? " not" : "") + " null"); - Bootstrap.initUCBHelper(); - componentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, desktop); Log.i(TAG, "componentLoader is" + (componentLoader!=null ? " not" : "") + " null"); |