android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java | 3 +++ sal/android/lo-bootstrap.c | 4 ++-- sfx2/source/bastyp/helper.cxx | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 7ae10a8a420ff42c72afd1f4b5a53ad377b70c47 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Fri Mar 30 19:51:16 2012 +0300 Must call patch_libgnustl_shared() diff --git a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java index 93ed87e..d47a6ef 100644 --- a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java +++ b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java @@ -52,6 +52,9 @@ public class DocumentLoader Bootstrap.putenv("SAL_LOG=yes"); + Bootstrap.dlopen("libgnustl_shared.so"); + Bootstrap.patch_libgnustl_shared(); + // Load a lot of shlibs here explicitly in advance because that // makes debugging work better, sigh Bootstrap.dlopen("libvcllo.so"); commit bef7a8c054dcfa3a23819cee56df2d86ff44297a Author: Tor Lillqvist <tlillqv...@suse.com> Date: Fri Mar 30 19:50:37 2012 +0300 Use correct JNI name mangling of underscores diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index 068ba7c..a79b9dd 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -1502,8 +1502,8 @@ extract_files(const char *prefix) __attribute__ ((visibility("default"))) void -Java_org_libreoffice_android_Bootstrap_patch_libgnustl_shared(JNIEnv* env, - jobject clazz) +Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared(JNIEnv* env, + jobject clazz) { (void) env; (void) clazz; commit 3b0e35bf84ad8ac7acde659214cbab880bf47cda Author: Tor Lillqvist <tlillqv...@suse.com> Date: Fri Mar 30 19:49:59 2012 +0300 Correct method name in warning message diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 7885f0d..5da2d95 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -108,13 +108,14 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL ) } catch( const ucb::CommandAbortedException& ) { - SAL_WARN( "sfx2.bastyp", "createCursor: CommandAbortedException" ); + SAL_WARN( "sfx2.bastyp", "GetResultSet: CommandAbortedException" ); } catch( const uno::Exception& ) { - SAL_WARN( "sfx2.bastyp", "createCursor: Any other exception" ); + SAL_WARN( "sfx2.bastyp", "GetResultSet: Any other exception" ); } + if ( xResultSet.is() ) { pList = new StringList_Impl(); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits