android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 12 ++++++++++
android/qa/desktop/Makefile
| 4 +--
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 1543df470360d2e64428536a26a5996becc412d2
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 22 11:57:40 2012 +0300
Don't mention the same rdb files in both UNO_SERVICES and URE_MORE_SERVICES
Change-Id: Ieb6aea7d3683411ffcefc6c5e1e7facdef8ed105
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 7a15bf5..8e9edae 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -51,7 +51,7 @@ buildrcs:
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
>> assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >>
assets/program/fundamentalrc
echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb
<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
+ echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb
<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >>
assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled'
>> assets/program/fundamentalrc
echo
'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled'
>> assets/program/fundamentalrc
@@ -69,7 +69,7 @@ buildrcs:
echo "[Bootstrap]" > assets/program/unorc
echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >>
assets/program/unorc
echo 'UNO_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb $${URE_MORE_TYPES}' >>
assets/program/unorc
- echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb
file:///assets/program/services/services.rdb $${URE_MORE_SERVICES}' >>
assets/program/unorc
+ echo 'UNO_SERVICES=file:///assets/ure/share/misc/services.rdb
$${URE_MORE_SERVICES}' >> assets/program/unorc
# bootstraprc ini ...
echo "[Bootstrap]" > assets/program/bootstraprc
echo "InstallMode=<installmode>" >> assets/program/bootstraprc
commit b93300d91eff77376aac26ae0437df338cf91d1e
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 22 10:08:52 2012 +0300
A bit more introspective debugging output...
Change-Id: Ibfafe0d6420ad59e12b9eed4847c89e57a18d679
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 63ee569..3fdc453 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -122,6 +122,18 @@ public class DocumentLoader
xCompLoader.loadComponentFromURL
(sUrl, "_blank", 0, propertyValues);
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);
+ Log.i(TAG, "typeProvider is " + (typeProvider!=null ?
typeProvider.toString() : "null"));
+
+ if (typeProvider != null) {
+ com.sun.star.uno.Type[] types = typeProvider.getTypes();
+ if (types != null) {
+ for (com.sun.star.uno.Type t : types) {
+ Log.i(TAG, " " + t.getTypeName());
+ }
+ }
+ }
}
}
catch (Exception e) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
