android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 4 +++-
android/experimental/LibreOffice4Android/native-code.cxx
| 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d8feea6c28540797b4959e66bdc9f38209f7c512
Author: Tor Lillqvist <[email protected]>
Date: Fri Oct 19 18:10:58 2012 +0300
Seems that on the emulator the y scale is -1, huh
Change-Id: I1ad30e278a5b04de3ee544c30c38f4765539157d
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 e1e7506..841b341 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -575,7 +575,9 @@ public class DocumentLoader
int t = (int)(h/2 - values[Matrix.MTRANS_Y]/scale);
Log.i(TAG, "Unzoomed rect: " + l + ", " + t + ", " +
(int)(l+w/scale) + ", " + (int)(t+h/scale));
- Assert.assertTrue(values[Matrix.MSCALE_X] ==
values[Matrix.MSCALE_Y]);
+ Log.i(TAG, "Scales: " + values[Matrix.MSCALE_X] + ", " +
values[Matrix.MSCALE_Y]);
+
+ // Assert.assertTrue(values[Matrix.MSCALE_X] ==
values[Matrix.MSCALE_Y]);
super.draw(canvas);
commit a09a98ee45c024005b139a9c265d76a3bee8d89c
Author: Tor Lillqvist <[email protected]>
Date: Fri Oct 19 18:09:26 2012 +0300
Add ucppkg1
Change-Id: I471440867895b2a8ef2f2de90ed37f5b3c9c0721
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx
b/android/experimental/LibreOffice4Android/native-code.cxx
index 22c9a7e..f304915 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -42,6 +42,7 @@ extern "C"
extern void * swd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * t602filter_component_getFactory( const char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * textfd_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+ extern void * ucppkg1_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * unoxml_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * unordf_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * wpftdraw_component_getFactory( const char * pImplName, void
* pServiceManager, void * pRegistryKey );
@@ -88,6 +89,7 @@ lo_get_libmap(void)
{ "libswlo.a", sw_component_getFactory },
{ "libt602filterlo.a", t602filter_component_getFactory },
{ "libtextfdlo.a", textfd_component_getFactory },
+ { "libucppkg1.a", ucppkg1_component_getFactory },
{ "libunordflo.a", unordf_component_getFactory },
{ "libunoxmllo.a", unoxml_component_getFactory },
{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
