[Libreoffice-commits] .: 2 commits - android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile                                                 |    2 
 android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java |   32 +++++++---
 2 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 05f786fd2eb8056be946f6aadb21cdd61be8e226
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu May 24 17:41:09 2012 +0300

    More clueless test hacking
    
    Change-Id: I2623625380b11f3d6bf720387504b23ccce529e1

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 3fdc453..975cd05 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -105,14 +105,14 @@ public class DocumentLoader
             // Load the wanted document(s)
             String[] inputs = input.split(":");
             for (int i = 0; i < inputs.length; i++) {
-                com.sun.star.beans.PropertyValue propertyValues[] =
+                com.sun.star.beans.PropertyValue loadProps[] =
                     new com.sun.star.beans.PropertyValue[2];
-                propertyValues[0] = new com.sun.star.beans.PropertyValue();
-                propertyValues[0].Name = "Hidden";
-                propertyValues[0].Value = new Boolean(true);
-                propertyValues[1] = new com.sun.star.beans.PropertyValue();
-                propertyValues[1].Name = "ReadOnly";
-                propertyValues[1].Value = new Boolean(true);
+                loadProps[0] = new com.sun.star.beans.PropertyValue();
+                loadProps[0].Name = "Hidden";
+                loadProps[0].Value = new Boolean(true);
+                loadProps[1] = new com.sun.star.beans.PropertyValue();
+                loadProps[1].Name = "ReadOnly";
+                loadProps[1].Value = new Boolean(true);
 
                 String sUrl = "file://" + inputs[i];
 
@@ -120,7 +120,7 @@ public class DocumentLoader
 
                 Object oDoc =
                     xCompLoader.loadComponentFromURL
-                    (sUrl, "_blank", 0, propertyValues);
+                    (sUrl, "_blank", 0, loadProps);
                 Log.i(TAG, "oDoc is " + (oDoc!=null ? oDoc.toString() : "null"));
 
                 com.sun.star.lang.XTypeProvider typeProvider = (com.sun.star.lang.XTypeProvider) UnoRuntime.queryInterface(com.sun.star.lang.XTypeProvider.class, oDoc);
@@ -134,6 +134,22 @@ public class DocumentLoader
                         }
                     }
                 }
+
+                com.sun.star.view.XRenderable renderBabe = (com.sun.star.view.XRenderable) UnoRuntime.queryInterface(com.sun.star.view.XRenderable.class, oDoc);
+                Log.i(TAG, "renderBabe is " + (renderBabe!=null ? renderBabe.toString() : "null"));
+
+                com.sun.star.beans.PropertyValue renderProps[] =
+                    new com.sun.star.beans.PropertyValue[1];
+                renderProps[0] = new com.sun.star.beans.PropertyValue();
+                renderProps[0].Name = "IsPrinter";
+                renderProps[0].Value = new Boolean(true);
+//                renderProps[1] = new com.sun.star.beans.PropertyValue();
+//                renderProps[1].Name = "View";
+//                renderProps[1].Value = no idea where to get an XController...
+
+                Log.i(TAG, "getRendererCount: " + renderBabe.getRendererCount(oDoc, renderProps));
+
+                renderBabe.render(0, oDoc, renderProps);
             }
         }
         catch (Exception e) {
commit 4ff08c21cead20c03e2bd12568ab7dc7d8403371
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu May 24 17:40:30 2012 +0300

    Don't bother with so many test docs
    
    Change-Id: I725255224ae7a38d7a7843516b7ac979f79e0207

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 63fefa7..3774680 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -261,7 +261,7 @@ uninstall:
 	$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 run:
-	adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt:/assets/border.xls:/assets/test.odt:/assets/testVba.doc
+	adb shell am start -n org.libreoffice.android.examples/.DocumentLoader -e input /assets/test1.odt
 
 clean: properties
 	$(ANT) clean