ios/CustomTarget_LibreOffice_app.mk | 10 +--------- ios/experimental/LibreOffice/LibreOffice/lo.mm | 2 +- sal/rtl/bootstrap.cxx | 11 ++++++++++- 3 files changed, 12 insertions(+), 11 deletions(-)
New commits: commit 261f1439e5516f6d60317a675d261af330a9a74c Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 8 20:34:58 2013 +0300 Don't ignore -env: command line parameters in some cases Happened at least in the experimental iOS app. Change-Id: I725dde2f40ae9e64406e7a1b1dd5dc0da0a9ebd4 diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index a4169b3..5ee61b0 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -199,9 +199,18 @@ static sal_Bool getFromCommandLineArgs( } rtl_uString_release( pArg ); } - pNameValueList = &nameValueList; + // If osl_setCommandArgs() has not been called yet (for + // instance, if this gets called from a static initialiser), + // don't initialise pNameValueList, as that would cause the + // code to ignore any -env:FOO=BAR on the command line once + // osl is told about it. + if( nArgCount > 0 ) + pNameValueList = &nameValueList; } + if( ! pNameValueList ) + return sal_False; + sal_Bool found = sal_False; for( NameValueList::iterator ii = pNameValueList->begin() ; commit 0ef3218911ee843c0b2eb639669050d2dc056def Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 8 19:49:53 2013 +0300 This app is called "LibreOffice", not "Viewer" Change-Id: I19663a22cedc0ed4355fc63d28821d80520ee292 diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index 167948c..f65c532 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -156,7 +156,7 @@ lo_initialize(void) const int argc = sizeof(argv)/sizeof(*argv); - argv[0] = [[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"Viewer"] UTF8String]; + argv[0] = [[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: @"LibreOffice"] UTF8String]; NSString *app_root_escaped = [[[NSBundle mainBundle] bundlePath] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; commit d7094ab8b3ef199573b4a846cf4eff880b4870aa Author: Tor Lillqvist <t...@collabora.com> Date: Tue Oct 8 17:19:41 2013 +0300 Adapt to instdir and solver changes lately Change-Id: Idc6c20f6645f2e39b98a11f741aaa482f31c6ea1 diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 6fedb74..9ba7dec 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -59,14 +59,6 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) cp $(INSTDIR)/program/services/services.rdb $(appdir) cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure # -# Copy "registry" files -# -# FIXME This can be removed ? registry is copied below - mkdir -p $(appdir)/registry/modules $(appdir)/registry/res - cp $(OUTDIR)/xml/*.xcd $(appdir)/registry - mv $(appdir)/registry/fcfg_langpack_en-US.xcd $(appdir)/registry/res - cp -R $(OUTDIR)/xml/registry/* $(appdir)/registry -# # Copy .res files # # program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure, @@ -103,7 +95,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) ( \ echo '[Bootstrap]' && \ echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' && \ - echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry module:$${BRAND_BASE_DIR}/registry/modules res:$${BRAND_BASE_DIR}/registry' && \ + echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' && \ : ) > $(appdir)/fundamentalrc # ( \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits