android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 15
android/experimental/LibreOffice4Android/AndroidManifest.xml
| 4
android/experimental/LibreOffice4Android/Makefile
| 2
android/experimental/LibreOffice4Android/fonts.conf
| 2
android/experimental/LibreOffice4Android/res/values/styles.xml
| 12
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
| 596 ++++++++++
android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
| 596 ----------
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 2
8 files changed, 613 insertions(+), 616 deletions(-)
New commits:
commit 478465f21696230133bbf6c986f236d210504c5a
Author: Iain Billett <iainbill...@gmail.com>
Date: Mon Jun 25 14:25:00 2012 +0100
Fixed some erroneous package references.
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 ec3855f..daf42d9 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -622,21 +622,6 @@ public class DocumentLoader
{
return gestureDetector.onTouchEvent(event);
}
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- // app icon in action bar clicked; go home
- Intent intent = new Intent(this,
LibreOfficeUIActivity.class);
- intent.putExtras( extras );
- //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
}
// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml
b/android/experimental/LibreOffice4Android/AndroidManifest.xml
index f521536..fcf6210 100644
--- a/android/experimental/LibreOffice4Android/AndroidManifest.xml
+++ b/android/experimental/LibreOffice4Android/AndroidManifest.xml
@@ -14,8 +14,8 @@
android:theme="@android:style/Theme.Holo.Light">
<!-- Original Document Loader activity - file Viewer -->
- <activity android:name=".android.examples.DocumentLoader"
- android:label="LO DocumentLoader"
+ <activity android:name=".android.DocumentLoader"
+ android:label="DocumentLoader"
android:configChanges="orientation|keyboardHidden">
<!-- <intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 9423336..d2c5f8e 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -1,7 +1,7 @@
include ../../../config_host.mk
# The package of this app
-APP_PACKAGE=org.libreoffice.android.examples
+APP_PACKAGE=org.libreoffice
# We can't keep assuming APP_DATA_PATH like this, surely this can vary with
# Android versions and whatnot, this is temporary and works at least with the
diff --git a/android/experimental/LibreOffice4Android/fonts.conf
b/android/experimental/LibreOffice4Android/fonts.conf
index 699e9d1..263648a 100644
--- a/android/experimental/LibreOffice4Android/fonts.conf
+++ b/android/experimental/LibreOffice4Android/fonts.conf
@@ -74,7 +74,7 @@
later to patch in proper code in fontonfig on Android to
find out a good place.
-->
-
<cachedir>/data/data/org.libreoffice.android.examples/fontconfig</cachedir>
+ <cachedir>/data/data/org.libreoffice/fontconfig</cachedir>
<config>
<!--
diff --git a/android/experimental/LibreOffice4Android/res/values/styles.xml
b/android/experimental/LibreOffice4Android/res/values/styles.xml
new file mode 100644
index 0000000..5e74240
--- /dev/null
+++ b/android/experimental/LibreOffice4Android/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android";>
+ <style name="DocumentViewer" parent="@android:style/Theme.Holo">
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="android:windowActionModeOverlay">true</item>
+ <item
name="android:actionBarStyle">@style/TransparentDarkActionBar</item>
+ </style>
+ <style name="TransparentDarkActionBar"
parent="@android:style/Widget.Holo.ActionBar">
+ <item name="android:background">#dd000000</item>
+ </style>
+
+</resources>
\ No newline at end of file
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
new file mode 100644
index 0000000..9fa07f8
--- /dev/null
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -0,0 +1,596 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+//
+// This file is part of the LibreOffice project.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// This is just a testbed for ideas and implementations. (Still, it might turn
+// out to be somewhat useful as such while waiting for "real" apps.)
+
+// Important points:
+
+// Everything that might take a long time should be done asynchronously:
+// - loading the document (loadComponentFromURL())
+// - counting number of pages (getRendererCount())
+// - rendering a page (render())
+
+// Unclear whether pages can be rendered in parallel. Probably best to
+// serialize all the above in the same worker thread, for instance using
+// AsyncTask.SERIAL_EXECUTOR.
+
+// While a page is loading ideally should display some animated spinner (but
+// for now just a static "please wait" text).
+
+// Just three views are used for the pages: For the current page being viewed,
+// the previous, and the next. This could be bumped higher, need to make the
+// "3" into a parameter below.
+
+package org.libreoffice.android;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.TranslateAnimation;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.ViewFlipper;
+import android.widget.ViewSwitcher;
+
+import com.polites.android.GestureImageView;
+
+import com.sun.star.awt.Size;
+import com.sun.star.awt.XBitmap;
+import com.sun.star.awt.XControl;
+import com.sun.star.awt.XDevice;
+import com.sun.star.awt.XToolkit2;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XModel;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.view.XRenderable;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import org.libreoffice.android.Bootstrap;
+
+public class DocumentLoader
+ extends Activity
+{
+ private static final String TAG = "DocumentLoader";
+
+ // Size of a small virtual (bitmap) device used to find out page count and
+ // page sizes
+ private static final int SMALLSIZE = 128;
+
+ // We pre-render this many pages preceding and succeeding the currently
+ // viewed one, i.e. the total number of rendered pages kept is
+ // PAGECACHE_PLUSMINUS*2+1.
+ private static final int PAGECACHE_PLUSMINUS = 2;
+ private static final int PAGECACHE_SIZE = PAGECACHE_PLUSMINUS*2 + 1;
+
+ long timingOverhead;
+ XComponentContext context;
+ XMultiComponentFactory mcf;
+ XComponentLoader componentLoader;
+ XToolkit2 toolkit;
+ XDevice dummySmallDevice;
+ Object doc;
+ int pageCount;
+ XRenderable renderable;
+
+ GestureDetector gestureDetector;
+
+ ViewGroup.LayoutParams matchParent;
+
+ ViewFlipper flipper;
+
+ class GestureListener
+ extends GestureDetector.SimpleOnGestureListener
+ {
+ @Override
+ public boolean onFling(MotionEvent event1,
+ MotionEvent event2,
+ float velocityX,
+ float velocityY)
+ {
+ Log.i(TAG, "onFling: " + event1 + " " + event2);
+ if (event1.getX() - event2.getX() > 120) {
+ if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== pageCount-1)
+ return false;
+
+ Animation inFromRight = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 1, Animation.RELATIVE_TO_SELF, 0,
+
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
+ inFromRight.setDuration(500);
+ flipper.setInAnimation(inFromRight);
+
+ Animation outToLeft = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF,
-1,
+
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
+ outToLeft.setDuration(500);
+ flipper.setOutAnimation(outToLeft);
+
+ flipper.showNext();
+
+ ((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() +
PAGECACHE_PLUSMINUS) %
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
+ PAGECACHE_PLUSMINUS);
+ return true;
+ } else if (event2.getX() - event1.getX() > 120) {
+ if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== 0)
+ return false;
+
+ Animation inFromLeft = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, -1, Animation.RELATIVE_TO_SELF,
0,
+
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
+ inFromLeft.setDuration(500);
+ flipper.setInAnimation(inFromLeft);
+
+ Animation outToRight = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 1,
+
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
+ outToRight.setDuration(500);
+ flipper.setOutAnimation(outToRight);
+
+ flipper.showPrevious();
+
+ ((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() +
PAGECACHE_SIZE - PAGECACHE_PLUSMINUS) %
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
- PAGECACHE_PLUSMINUS);
+
+ return true;
+ }
+ return false;
+ }
+ }
+
+ class MyXController
+ implements XController
+ {
+
+ XFrame frame;
+ XModel model;
+
+ public void attachFrame(XFrame frame)
+ {
+ Log.i(TAG, "attachFrame");
+ this.frame = frame;
+ }
+
+ public boolean attachModel(XModel model)
+ {
+ Log.i(TAG, "attachModel");
+ this.model = model;
+ return true;
+ }
+
+ public boolean suspend(boolean doSuspend)
+ {
+ Log.i(TAG, "suspend");
+ return false;
+ }
+
+ public Object getViewData()
+ {
+ Log.i(TAG, "getViewData");
+ return null;
+ }
+
+ public void restoreViewData(Object data)
+ {
+ Log.i(TAG, "restoreViewData");
+ }
+
+ public XModel getModel()
+ {
+ Log.i(TAG, "getModel");
+ return model;
+ }
+
+ public XFrame getFrame()
+ {
+ Log.i(TAG, "getFrame");
+ return frame;
+ }
+
+ public void dispose()
+ {
+ Log.i(TAG, "dispose");
+ }
+
+ public void addEventListener(XEventListener listener)
+ {
+ Log.i(TAG, "addEventListener");
+ }
+
+ public void removeEventListener(XEventListener listener)
+ {
+ Log.i(TAG, "removeEventListener");
+ }
+ }
+
+ ByteBuffer renderPage(int number)
+ {
+ try {
+ // Use dummySmallDevice with no scale of offset just to find out
+ // the paper size of this page.
+
+ PropertyValue renderProps[] = new PropertyValue[3];
+ renderProps[0] = new PropertyValue();
+ renderProps[0].Name = "IsPrinter";
+ renderProps[0].Value = new Boolean(true);
+ renderProps[1] = new PropertyValue();
+ renderProps[1].Name = "RenderDevice";
+ renderProps[1].Value = dummySmallDevice;
+ renderProps[2] = new PropertyValue();
+ renderProps[2].Name = "View";
+ renderProps[2].Value = new MyXController();
+
+ // getRenderer returns a set of properties that include the
PageSize
+ long t0 = System.currentTimeMillis();
+ PropertyValue rendererProps[] = renderable.getRenderer(number,
doc, renderProps);
+ long t1 = System.currentTimeMillis();
+ Log.i(TAG, "getRenderer took " + ((t1-t0)-timingOverhead) + " ms");
+
+ int pageWidth = 0, pageHeight = 0;
+ for (int i = 0; i < rendererProps.length; i++) {
+ if (rendererProps[i].Name.equals("PageSize")) {
+ pageWidth = ((Size) rendererProps[i].Value).Width;
+ pageHeight = ((Size) rendererProps[i].Value).Height;
+ Log.i(TAG, "PageSize: " + pageWidth + "x" + pageHeight);
+ }
+ }
+
+ // Create a new device with the correct scale and offset
+ ByteBuffer bb =
ByteBuffer.allocateDirect(flipper.getWidth()*flipper.getHeight()*4);
+ long wrapped_bb = Bootstrap.new_byte_buffer_wrapper(bb);
+
+ XDevice device;
+ if (pageWidth == 0) {
+ // Huh?
+ device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(), 1, 1, 0, 0, wrapped_bb);
+ } else {
+
+ // Scale so that it fits our device which has a resolution of
96/in (see
+ // SvpSalGraphics::GetResolution()). The page size returned
from getRenderer() is in 1/mm * 100.
+
+ int scaleNumerator, scaleDenominator;
+
+ // If the view has a wider aspect ratio than the page, fit
+ // height; otherwise, fit width
+ if ((double) flipper.getWidth() / flipper.getHeight() >
(double) pageWidth / pageHeight) {
+ scaleNumerator = flipper.getHeight();
+ scaleDenominator = pageHeight / 2540 * 96;
+ } else {
+ scaleNumerator = flipper.getWidth();
+ scaleDenominator = pageWidth / 2540 * 96;
+ }
+ Log.i(TAG, "Scaling with " + scaleNumerator + "/" +
scaleDenominator);
+
+ device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(),
+
scaleNumerator, scaleDenominator,
+ 0, 0,
+
wrapped_bb);
+ }
+
+ // Update the property that points to the device
+ renderProps[1].Value = device;
+
+ t0 = System.currentTimeMillis();
+ renderable.render(number, doc, renderProps);
+ t1 = System.currentTimeMillis();
+ Log.i(TAG, "Rendering page " + number + " took " +
((t1-t0)-timingOverhead) + " ms");
+
+ Bootstrap.force_full_alpha_bb(bb, 0, flipper.getWidth() *
flipper.getHeight() * 4);
+
+ return bb;
+ }
+ catch (Exception e) {
+ e.printStackTrace(System.err);
+ finish();
+ }
+
+ return null;
+ }
+
+ enum PageState { NONEXISTENT, LOADING, READY };
+
+ class PageViewer
+ extends ViewSwitcher
+ {
+ int currentPageNumber = -1;
+ TextView waitView;
+ PageState state = PageState.NONEXISTENT;
+ Bitmap bm;
+
+ class PageLoadTask
+ extends AsyncTask<Integer, Void, Integer>
+ {
+ protected Integer doInBackground(Integer... params)
+ {
+ int number = params[0];
+
+ if (number >= pageCount)
+ return -1;
+
+ state = PageState.LOADING;
+ currentPageNumber = number;
+ ByteBuffer bb = renderPage(currentPageNumber);
+ bm = Bitmap.createBitmap(flipper.getWidth(),
flipper.getHeight(), Bitmap.Config.ARGB_8888);
+ bm.copyPixelsFromBuffer(bb);
+
+ return currentPageNumber;
+ }
+
+ protected void onPostExecute(Integer result)
+ {
+ Log.i(TAG, "onPostExecute: " + result);
+ if (result == -1)
+ return;
+
+ ImageView imageView = new ImageView(DocumentLoader.this);
+ imageView.setImageBitmap(bm);
+
+ imageView.setScaleY(-1);
+
+ if (getChildCount() == 2)
+ removeViewAt(1);
+ addView(imageView, 1, matchParent);
+ showNext();
+ state = PageState.READY;
+ }
+ }
+
+ void display(int number)
+ {
+ Log.i(TAG, "PageViewer display(" + number + ")");
+ if (number >= 0)
+ waitView.setText("Page " + (number+1) + ", wait...");
+ state = PageState.NONEXISTENT;
+
+ if (getDisplayedChild() == 1) {
+ showPrevious();
+ removeViewAt(1);
+ }
+
+ if (number >= 0) {
+ new
PageLoadTask().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, number);
+ }
+ }
+
+ PageViewer(int number)
+ {
+ super(DocumentLoader.this);
+
+ waitView = new TextView(DocumentLoader.this);
+ waitView.setTextSize(24);
+ waitView.setGravity(Gravity.CENTER);
+ waitView.setBackgroundColor(Color.WHITE);
+ waitView.setTextColor(Color.BLACK);
+ addView(waitView, 0, matchParent);
+
+ display(number);
+ }
+ }
+
+ class DocumentLoadTask
+ extends AsyncTask<String, Void, Void>
+ {
+ protected Void doInBackground(String... params)
+ {
+ try {
+ String url = params[0];
+ Log.i(TAG, "Attempting to load " + url);
+
+ PropertyValue loadProps[] = new PropertyValue[3];
+ loadProps[0] = new PropertyValue();
+ loadProps[0].Name = "Hidden";
+ loadProps[0].Value = new Boolean(true);
+ loadProps[1] = new PropertyValue();
+ loadProps[1].Name = "ReadOnly";
+ loadProps[1].Value = new Boolean(true);
+ loadProps[2] = new PropertyValue();
+ loadProps[2].Name = "Preview";
+ loadProps[2].Value = new Boolean(true);
+
+ long t0 = System.currentTimeMillis();
+ doc = componentLoader.loadComponentFromURL(url, "_blank", 0,
loadProps);
+ long t1 = System.currentTimeMillis();
+ Log.i(TAG, "Loading took " + ((t1-t0)-timingOverhead) + " ms");
+
+ Object toolkitService = mcf.createInstanceWithContext
+ ("com.sun.star.awt.Toolkit", context);
+ toolkit = (XToolkit2)
UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
+
+ renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
+
+ // Set up dummySmallDevice and use it to find out the number
+ // of pages ("renderers").
+ ByteBuffer smallbb =
ByteBuffer.allocateDirect(SMALLSIZE*SMALLSIZE*4);
+ long wrapped_smallbb =
Bootstrap.new_byte_buffer_wrapper(smallbb);
+ dummySmallDevice =
toolkit.createScreenCompatibleDeviceUsingBuffer(SMALLSIZE, SMALLSIZE, 1, 1, 0,
0, wrapped_smallbb);
+
+ PropertyValue renderProps[] = new PropertyValue[3];
+ renderProps[0] = new PropertyValue();
+ renderProps[0].Name = "IsPrinter";
+ renderProps[0].Value = new Boolean(true);
+ renderProps[1] = new PropertyValue();
+ renderProps[1].Name = "RenderDevice";
+ renderProps[1].Value = dummySmallDevice;
+ renderProps[2] = new PropertyValue();
+ renderProps[2].Name = "View";
+ renderProps[2].Value = new MyXController();
+
+ t0 = System.currentTimeMillis();
+ pageCount = renderable.getRendererCount(doc, renderProps);
+ t1 = System.currentTimeMillis();
+ Log.i(TAG, "getRendererCount: " + pageCount + ", took " +
((t1-t0)-timingOverhead) + " ms");
+ }
+ catch (Exception e) {
+ e.printStackTrace(System.err);
+ finish();
+ }
+ return null;
+ }
+ }
+
+ static void dumpUNOObject(String objectName, Object object)
+ {
+ Log.i(TAG, objectName + " is " + (object != null ? object.toString() :
"null"));
+
+ if (object == null)
+ return;
+
+ XTypeProvider typeProvider = (XTypeProvider)
+ UnoRuntime.queryInterface(XTypeProvider.class, object);
+ if (typeProvider == null)
+ return;
+
+ Type[] types = typeProvider.getTypes();
+ if (types == null)
+ return;
+
+ for (Type t : types)
+ Log.i(TAG, " " + t.getTypeName());
+ }
+
+ static void dumpBytes(String name, byte[] bytes, int offset)
+ {
+ if (bytes == null) {
+ Log.i(TAG, name + " is null");
+ return;
+ }
+ Log.i(TAG, name + ":");
+
+ if (offset != 0)
+ Log.i(TAG, " (offset " + offset + ")");
+
+ for (int i = offset; i < Math.min(bytes.length, offset+160); i += 16) {
+ String s = "";
+ for (int j = i; j < Math.min(bytes.length, i+16); j++)
+ s = s + String.format(" %02x", bytes[j]);
+
+ Log.i(TAG, s);
+ }
+ }
+
+ static void dumpBytes(String name, ByteBuffer bytes, int offset)
+ {
+ if (bytes == null) {
+ Log.i(TAG, name + " is null");
+ return;
+ }
+ Log.i(TAG, name + ":");
+
+ if (offset != 0)
+ Log.i(TAG, " (offset " + offset + ")");
+
+ for (int i = offset; i < Math.min(bytes.limit(), offset+160); i += 16)
{
+ String s = "";
+ for (int j = i; j < Math.min(bytes.limit(), i+16); j++)
+ s = s + String.format(" %02x", bytes.get(j));
+
+ Log.i(TAG, s);
+ }
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+
+ gestureDetector = new GestureDetector(this, new GestureListener());
+
+ try {
+ long t0 = System.currentTimeMillis();
+ long t1 = System.currentTimeMillis();
+ timingOverhead = t1 - t0;
+
+ 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("libvcllo.so");
+ Bootstrap.dlopen("libmergedlo.so");
+ Bootstrap.dlopen("libswdlo.so");
+ Bootstrap.dlopen("libswlo.so");
+
+ // Log.i(TAG, "Sleeping NOW");
+ // Thread.sleep(20000);
+
+ context =
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
+
+ Log.i(TAG, "context is" + (context!=null ? " not" : "") + " null");
+
+ mcf = context.getServiceManager();
+
+ Log.i(TAG, "mcf is" + (mcf!=null ? " not" : "") + " null");
+
+ String input = getIntent().getStringExtra("input");
+ if (input == null)
+ input = "/assets/test1.odt";
+
+ // We need to fake up an argv, and the argv[0] even needs to
+ // point to some file name that we can pretend is the "program".
+ // setCommandArgs() will prefix argv[0] with the app's data
+ // directory.
+
+ String[] argv = { "lo-document-loader", input };
+
+ Bootstrap.setCommandArgs(argv);
+
+ Bootstrap.initVCL();
+
+ Object desktop = mcf.createInstanceWithContext
+ ("com.sun.star.frame.Desktop", context);
+
+ 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");
+
+ // Load the wanted document
+ new
DocumentLoadTask().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, "file://" +
input);
+
+ flipper = new ViewFlipper(this);
+
+ matchParent = new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT);
+
+ flipper.addView(new PageViewer(0), 0, matchParent);
+ for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
+ 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);
+
+ setContentView(flipper);
+ }
+ catch (Exception e) {
+ e.printStackTrace(System.err);
+ finish();
+ }
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event)
+ {
+ return gestureDetector.onTouchEvent(event);
+ }
+}
+
+// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
deleted file mode 100644
index cf042a4..0000000
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
+++ /dev/null
@@ -1,596 +0,0 @@
-// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-//
-// This file is part of the LibreOffice project.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// This is just a testbed for ideas and implementations. (Still, it might turn
-// out to be somewhat useful as such while waiting for "real" apps.)
-
-// Important points:
-
-// Everything that might take a long time should be done asynchronously:
-// - loading the document (loadComponentFromURL())
-// - counting number of pages (getRendererCount())
-// - rendering a page (render())
-
-// Unclear whether pages can be rendered in parallel. Probably best to
-// serialize all the above in the same worker thread, for instance using
-// AsyncTask.SERIAL_EXECUTOR.
-
-// While a page is loading ideally should display some animated spinner (but
-// for now just a static "please wait" text).
-
-// Just three views are used for the pages: For the current page being viewed,
-// the previous, and the next. This could be bumped higher, need to make the
-// "3" into a parameter below.
-
-package org.libreoffice.android.examples;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.Gravity;
-import android.view.MotionEvent;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationSet;
-import android.view.animation.TranslateAnimation;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.ViewFlipper;
-import android.widget.ViewSwitcher;
-
-import com.polites.android.GestureImageView;
-
-import com.sun.star.awt.Size;
-import com.sun.star.awt.XBitmap;
-import com.sun.star.awt.XControl;
-import com.sun.star.awt.XDevice;
-import com.sun.star.awt.XToolkit2;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.frame.XComponentLoader;
-import com.sun.star.frame.XController;
-import com.sun.star.frame.XFrame;
-import com.sun.star.frame.XModel;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.lang.XMultiComponentFactory;
-import com.sun.star.lang.XTypeProvider;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.view.XRenderable;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import org.libreoffice.android.Bootstrap;
-
-public class DocumentLoader
- extends Activity
-{
- private static final String TAG = "DocumentLoader";
-
- // Size of a small virtual (bitmap) device used to find out page count and
- // page sizes
- private static final int SMALLSIZE = 128;
-
- // We pre-render this many pages preceding and succeeding the currently
- // viewed one, i.e. the total number of rendered pages kept is
- // PAGECACHE_PLUSMINUS*2+1.
- private static final int PAGECACHE_PLUSMINUS = 2;
- private static final int PAGECACHE_SIZE = PAGECACHE_PLUSMINUS*2 + 1;
-
- long timingOverhead;
- XComponentContext context;
- XMultiComponentFactory mcf;
- XComponentLoader componentLoader;
- XToolkit2 toolkit;
- XDevice dummySmallDevice;
- Object doc;
- int pageCount;
- XRenderable renderable;
-
- GestureDetector gestureDetector;
-
- ViewGroup.LayoutParams matchParent;
-
- ViewFlipper flipper;
-
- class GestureListener
- extends GestureDetector.SimpleOnGestureListener
- {
- @Override
- public boolean onFling(MotionEvent event1,
- MotionEvent event2,
- float velocityX,
- float velocityY)
- {
- Log.i(TAG, "onFling: " + event1 + " " + event2);
- if (event1.getX() - event2.getX() > 120) {
- if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== pageCount-1)
- return false;
-
- Animation inFromRight = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 1, Animation.RELATIVE_TO_SELF, 0,
-
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
- inFromRight.setDuration(500);
- flipper.setInAnimation(inFromRight);
-
- Animation outToLeft = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF,
-1,
-
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
- outToLeft.setDuration(500);
- flipper.setOutAnimation(outToLeft);
-
- flipper.showNext();
-
- ((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() +
PAGECACHE_PLUSMINUS) %
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
+ PAGECACHE_PLUSMINUS);
- return true;
- } else if (event2.getX() - event1.getX() > 120) {
- if (((PageViewer)flipper.getCurrentView()).currentPageNumber
== 0)
- return false;
-
- Animation inFromLeft = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, -1, Animation.RELATIVE_TO_SELF,
0,
-
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
- inFromLeft.setDuration(500);
- flipper.setInAnimation(inFromLeft);
-
- Animation outToRight = new
TranslateAnimation(Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 1,
-
Animation.RELATIVE_TO_SELF, 0, Animation.RELATIVE_TO_SELF, 0);
- outToRight.setDuration(500);
- flipper.setOutAnimation(outToRight);
-
- flipper.showPrevious();
-
- ((PageViewer)flipper.getChildAt((flipper.getDisplayedChild() +
PAGECACHE_SIZE - PAGECACHE_PLUSMINUS) %
PAGECACHE_SIZE)).display(((PageViewer)flipper.getCurrentView()).currentPageNumber
- PAGECACHE_PLUSMINUS);
-
- return true;
- }
- return false;
- }
- }
-
- class MyXController
- implements XController
- {
-
- XFrame frame;
- XModel model;
-
- public void attachFrame(XFrame frame)
- {
- Log.i(TAG, "attachFrame");
- this.frame = frame;
- }
-
- public boolean attachModel(XModel model)
- {
- Log.i(TAG, "attachModel");
- this.model = model;
- return true;
- }
-
- public boolean suspend(boolean doSuspend)
- {
- Log.i(TAG, "suspend");
- return false;
- }
-
- public Object getViewData()
- {
- Log.i(TAG, "getViewData");
- return null;
- }
-
- public void restoreViewData(Object data)
- {
- Log.i(TAG, "restoreViewData");
- }
-
- public XModel getModel()
- {
- Log.i(TAG, "getModel");
- return model;
- }
-
- public XFrame getFrame()
- {
- Log.i(TAG, "getFrame");
- return frame;
- }
-
- public void dispose()
- {
- Log.i(TAG, "dispose");
- }
-
- public void addEventListener(XEventListener listener)
- {
- Log.i(TAG, "addEventListener");
- }
-
- public void removeEventListener(XEventListener listener)
- {
- Log.i(TAG, "removeEventListener");
- }
- }
-
- ByteBuffer renderPage(int number)
- {
- try {
- // Use dummySmallDevice with no scale of offset just to find out
- // the paper size of this page.
-
- PropertyValue renderProps[] = new PropertyValue[3];
- renderProps[0] = new PropertyValue();
- renderProps[0].Name = "IsPrinter";
- renderProps[0].Value = new Boolean(true);
- renderProps[1] = new PropertyValue();
- renderProps[1].Name = "RenderDevice";
- renderProps[1].Value = dummySmallDevice;
- renderProps[2] = new PropertyValue();
- renderProps[2].Name = "View";
- renderProps[2].Value = new MyXController();
-
- // getRenderer returns a set of properties that include the
PageSize
- long t0 = System.currentTimeMillis();
- PropertyValue rendererProps[] = renderable.getRenderer(number,
doc, renderProps);
- long t1 = System.currentTimeMillis();
- Log.i(TAG, "getRenderer took " + ((t1-t0)-timingOverhead) + " ms");
-
- int pageWidth = 0, pageHeight = 0;
- for (int i = 0; i < rendererProps.length; i++) {
- if (rendererProps[i].Name.equals("PageSize")) {
- pageWidth = ((Size) rendererProps[i].Value).Width;
- pageHeight = ((Size) rendererProps[i].Value).Height;
- Log.i(TAG, "PageSize: " + pageWidth + "x" + pageHeight);
- }
- }
-
- // Create a new device with the correct scale and offset
- ByteBuffer bb =
ByteBuffer.allocateDirect(flipper.getWidth()*flipper.getHeight()*4);
- long wrapped_bb = Bootstrap.new_byte_buffer_wrapper(bb);
-
- XDevice device;
- if (pageWidth == 0) {
- // Huh?
- device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(), 1, 1, 0, 0, wrapped_bb);
- } else {
-
- // Scale so that it fits our device which has a resolution of
96/in (see
- // SvpSalGraphics::GetResolution()). The page size returned
from getRenderer() is in 1/mm * 100.
-
- int scaleNumerator, scaleDenominator;
-
- // If the view has a wider aspect ratio than the page, fit
- // height; otherwise, fit width
- if ((double) flipper.getWidth() / flipper.getHeight() >
(double) pageWidth / pageHeight) {
- scaleNumerator = flipper.getHeight();
- scaleDenominator = pageHeight / 2540 * 96;
- } else {
- scaleNumerator = flipper.getWidth();
- scaleDenominator = pageWidth / 2540 * 96;
- }
- Log.i(TAG, "Scaling with " + scaleNumerator + "/" +
scaleDenominator);
-
- device =
toolkit.createScreenCompatibleDeviceUsingBuffer(flipper.getWidth(),
flipper.getHeight(),
-
scaleNumerator, scaleDenominator,
- 0, 0,
-
wrapped_bb);
- }
-
- // Update the property that points to the device
- renderProps[1].Value = device;
-
- t0 = System.currentTimeMillis();
- renderable.render(number, doc, renderProps);
- t1 = System.currentTimeMillis();
- Log.i(TAG, "Rendering page " + number + " took " +
((t1-t0)-timingOverhead) + " ms");
-
- Bootstrap.force_full_alpha_bb(bb, 0, flipper.getWidth() *
flipper.getHeight() * 4);
-
- return bb;
- }
- catch (Exception e) {
- e.printStackTrace(System.err);
- finish();
- }
-
- return null;
- }
-
- enum PageState { NONEXISTENT, LOADING, READY };
-
- class PageViewer
- extends ViewSwitcher
- {
- int currentPageNumber = -1;
- TextView waitView;
- PageState state = PageState.NONEXISTENT;
- Bitmap bm;
-
- class PageLoadTask
- extends AsyncTask<Integer, Void, Integer>
- {
- protected Integer doInBackground(Integer... params)
- {
- int number = params[0];
-
- if (number >= pageCount)
- return -1;
-
- state = PageState.LOADING;
- currentPageNumber = number;
- ByteBuffer bb = renderPage(currentPageNumber);
- bm = Bitmap.createBitmap(flipper.getWidth(),
flipper.getHeight(), Bitmap.Config.ARGB_8888);
- bm.copyPixelsFromBuffer(bb);
-
- return currentPageNumber;
- }
-
- protected void onPostExecute(Integer result)
- {
- Log.i(TAG, "onPostExecute: " + result);
- if (result == -1)
- return;
-
- ImageView imageView = new ImageView(DocumentLoader.this);
- imageView.setImageBitmap(bm);
-
- imageView.setScaleY(-1);
-
- if (getChildCount() == 2)
- removeViewAt(1);
- addView(imageView, 1, matchParent);
- showNext();
- state = PageState.READY;
- }
- }
-
- void display(int number)
- {
- Log.i(TAG, "PageViewer display(" + number + ")");
- if (number >= 0)
- waitView.setText("Page " + (number+1) + ", wait...");
- state = PageState.NONEXISTENT;
-
- if (getDisplayedChild() == 1) {
- showPrevious();
- removeViewAt(1);
- }
-
- if (number >= 0) {
- new
PageLoadTask().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, number);
- }
- }
-
- PageViewer(int number)
- {
- super(DocumentLoader.this);
-
- waitView = new TextView(DocumentLoader.this);
- waitView.setTextSize(24);
- waitView.setGravity(Gravity.CENTER);
- waitView.setBackgroundColor(Color.WHITE);
- waitView.setTextColor(Color.BLACK);
- addView(waitView, 0, matchParent);
-
- display(number);
- }
- }
-
- class DocumentLoadTask
- extends AsyncTask<String, Void, Void>
- {
- protected Void doInBackground(String... params)
- {
- try {
- String url = params[0];
- Log.i(TAG, "Attempting to load " + url);
-
- PropertyValue loadProps[] = new PropertyValue[3];
- loadProps[0] = new PropertyValue();
- loadProps[0].Name = "Hidden";
- loadProps[0].Value = new Boolean(true);
- loadProps[1] = new PropertyValue();
- loadProps[1].Name = "ReadOnly";
- loadProps[1].Value = new Boolean(true);
- loadProps[2] = new PropertyValue();
- loadProps[2].Name = "Preview";
- loadProps[2].Value = new Boolean(true);
-
- long t0 = System.currentTimeMillis();
- doc = componentLoader.loadComponentFromURL(url, "_blank", 0,
loadProps);
- long t1 = System.currentTimeMillis();
- Log.i(TAG, "Loading took " + ((t1-t0)-timingOverhead) + " ms");
-
- Object toolkitService = mcf.createInstanceWithContext
- ("com.sun.star.awt.Toolkit", context);
- toolkit = (XToolkit2)
UnoRuntime.queryInterface(XToolkit2.class, toolkitService);
-
- renderable = (XRenderable)
UnoRuntime.queryInterface(XRenderable.class, doc);
-
- // Set up dummySmallDevice and use it to find out the number
- // of pages ("renderers").
- ByteBuffer smallbb =
ByteBuffer.allocateDirect(SMALLSIZE*SMALLSIZE*4);
- long wrapped_smallbb =
Bootstrap.new_byte_buffer_wrapper(smallbb);
- dummySmallDevice =
toolkit.createScreenCompatibleDeviceUsingBuffer(SMALLSIZE, SMALLSIZE, 1, 1, 0,
0, wrapped_smallbb);
-
- PropertyValue renderProps[] = new PropertyValue[3];
- renderProps[0] = new PropertyValue();
- renderProps[0].Name = "IsPrinter";
- renderProps[0].Value = new Boolean(true);
- renderProps[1] = new PropertyValue();
- renderProps[1].Name = "RenderDevice";
- renderProps[1].Value = dummySmallDevice;
- renderProps[2] = new PropertyValue();
- renderProps[2].Name = "View";
- renderProps[2].Value = new MyXController();
-
- t0 = System.currentTimeMillis();
- pageCount = renderable.getRendererCount(doc, renderProps);
- t1 = System.currentTimeMillis();
- Log.i(TAG, "getRendererCount: " + pageCount + ", took " +
((t1-t0)-timingOverhead) + " ms");
- }
- catch (Exception e) {
- e.printStackTrace(System.err);
- finish();
- }
- return null;
- }
- }
-
- static void dumpUNOObject(String objectName, Object object)
- {
- Log.i(TAG, objectName + " is " + (object != null ? object.toString() :
"null"));
-
- if (object == null)
- return;
-
- XTypeProvider typeProvider = (XTypeProvider)
- UnoRuntime.queryInterface(XTypeProvider.class, object);
- if (typeProvider == null)
- return;
-
- Type[] types = typeProvider.getTypes();
- if (types == null)
- return;
-
- for (Type t : types)
- Log.i(TAG, " " + t.getTypeName());
- }
-
- static void dumpBytes(String name, byte[] bytes, int offset)
- {
- if (bytes == null) {
- Log.i(TAG, name + " is null");
- return;
- }
- Log.i(TAG, name + ":");
-
- if (offset != 0)
- Log.i(TAG, " (offset " + offset + ")");
-
- for (int i = offset; i < Math.min(bytes.length, offset+160); i += 16) {
- String s = "";
- for (int j = i; j < Math.min(bytes.length, i+16); j++)
- s = s + String.format(" %02x", bytes[j]);
-
- Log.i(TAG, s);
- }
- }
-
- static void dumpBytes(String name, ByteBuffer bytes, int offset)
- {
- if (bytes == null) {
- Log.i(TAG, name + " is null");
- return;
- }
- Log.i(TAG, name + ":");
-
- if (offset != 0)
- Log.i(TAG, " (offset " + offset + ")");
-
- for (int i = offset; i < Math.min(bytes.limit(), offset+160); i += 16)
{
- String s = "";
- for (int j = i; j < Math.min(bytes.limit(), i+16); j++)
- s = s + String.format(" %02x", bytes.get(j));
-
- Log.i(TAG, s);
- }
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
-
- gestureDetector = new GestureDetector(this, new GestureListener());
-
- try {
- long t0 = System.currentTimeMillis();
- long t1 = System.currentTimeMillis();
- timingOverhead = t1 - t0;
-
- 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("libvcllo.so");
- Bootstrap.dlopen("libmergedlo.so");
- Bootstrap.dlopen("libswdlo.so");
- Bootstrap.dlopen("libswlo.so");
-
- // Log.i(TAG, "Sleeping NOW");
- // Thread.sleep(20000);
-
- context =
com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext();
-
- Log.i(TAG, "context is" + (context!=null ? " not" : "") + " null");
-
- mcf = context.getServiceManager();
-
- Log.i(TAG, "mcf is" + (mcf!=null ? " not" : "") + " null");
-
- String input = getIntent().getStringExtra("input");
- if (input == null)
- input = "/assets/test1.odt";
-
- // We need to fake up an argv, and the argv[0] even needs to
- // point to some file name that we can pretend is the "program".
- // setCommandArgs() will prefix argv[0] with the app's data
- // directory.
-
- String[] argv = { "lo-document-loader", input };
-
- Bootstrap.setCommandArgs(argv);
-
- Bootstrap.initVCL();
-
- Object desktop = mcf.createInstanceWithContext
- ("com.sun.star.frame.Desktop", context);
-
- 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");
-
- // Load the wanted document
- new
DocumentLoadTask().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, "file://" +
input);
-
- flipper = new ViewFlipper(this);
-
- matchParent = new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT);
-
- flipper.addView(new PageViewer(0), 0, matchParent);
- for (int i = 0; i < PAGECACHE_PLUSMINUS; i++)
- 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);
-
- setContentView(flipper);
- }
- catch (Exception e) {
- e.printStackTrace(System.err);
- finish();
- }
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event)
- {
- return gestureDetector.onTouchEvent(event);
- }
-}
-
-// vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 0f31f19..420b485 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -1,7 +1,7 @@
package org.libreoffice.ui;
import org.libreoffice.R;
-import org.libreoffice.android.examples.DocumentLoader;
+import org.libreoffice.android.DocumentLoader;
import java.io.File;
import java.io.FileFilter;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
