[Libreoffice-commits] .: 2 commits - android/qa desktop/source

[Michael Meeks]

 android/qa/desktop/Makefile        |   12 ++++++------
 desktop/source/app/sofficemain.cxx |   13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 7b0123b9ea3e2f67ea8205cfd38bc5cd28225cb4
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Jan 21 21:55:53 2012 +0000

    android: hard-code path to 'lofficerc' in assets/

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 57dc6a4..4578657 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -29,10 +29,10 @@ all: build-ant
 buildrcs:
 # main sofficerc ini ...
 	mkdir -p assets/program/
-	echo "[Bootstrap]" > assets/program/sofficerc
-	echo "Logo=1" >> assets/program/sofficerc
-	echo "NativeProgress=1" >> assets/program/sofficerc
-	echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> assets/program/sofficerc
+	echo "[Bootstrap]" > assets/program/lofficerc
+	echo "Logo=1" >> assets/program/lofficerc
+	echo "NativeProgress=1" >> assets/program/lofficerc
+	echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> assets/program/lofficerc
 # fundamentalrc ini ...
 	echo "[Bootstrap]" > assets/program/fundamentalrc
 	echo "LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/fundamentalrc
@@ -186,9 +186,9 @@ uninstall:
 	adb uninstall $(APP_PACKAGE)
 
 run:
-	echo "STAR_RESOURCEPATH=/assets/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector -env:INIFILENAME=file:///assets/program/sofficerc" >cmdline
+	echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf -env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
 	adb push cmdline $(APP_DATA_PATH)/cmdline
-	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-main-delay 5 -e lo-strace yes -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
 
 # If you reinstall an app several times, even if you uninstall it
 # between, disk space seems to leak that won't get recycled until you
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 8faa99f..835c358 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -34,6 +34,7 @@
 #include "cmdlinehelp.hxx"
 
 #include <rtl/logfile.hxx>
+#include <rtl/bootstrap.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
 int SVMain();
@@ -44,6 +45,8 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 {
 #ifdef ANDROID
     try {
+        rtl::Bootstrap::setIniFilename(
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///assets/program/lofficerc")));
 #endif
     tools::extendApplicationEnvironment();
 
commit f177253cd12ae5806061972de29dadca3779c813
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Jan 21 21:46:00 2012 +0000

    android: print out exception messages that escaped 'main'

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 447948a..8faa99f 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -42,6 +42,9 @@ int SVMain();
 
 extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 {
+#ifdef ANDROID
+    try {
+#endif
     tools::extendApplicationEnvironment();
 
     RTL_LOGFILE_PRODUCT_TRACE( "PERFORMANCE - enter Main()" );
@@ -65,6 +68,13 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
     }
 #endif
     return SVMain();
+#ifdef ANDROID
+    } catch (const ::com::sun::star::uno::Exception &e) {
+        fprintf (stderr, "Not handled UNO exception at main: '%s'\n",
+                 rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        throw e; // to get exception type printed
+    }
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */