android/qa/desktop/Makefile | 7 +++++++ desktop/source/app/app.cxx | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-)
New commits: commit 3ad0561957537ac755206347c0902632985126fe Author: Michael Meeks <[email protected]> Date: Fri Feb 24 10:57:02 2012 +0000 android: remove annoying & un-necessary dialog on start diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 393db72..454fb00 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1802,12 +1802,6 @@ int Desktop::Main() // if this run of the office is triggered by restart, some additional actions should be done DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() ); -#ifdef ANDROID - // For some reason we're not getting a desktop frame or component [odd] - ErrorBox aKickStartVCL( NULL, WB_OK, rtl::OUString::createFromAscii("My very own title!") ); - aKickStartVCL.SetText( rtl::OUString::createFromAscii("Delphic Utterance") ); - aKickStartVCL.Show(); // don't execute - just leave it lying around .... -#endif Execute(); } } commit df92de0cc0e09ab96788e83bb7387946a3425fed Author: Michael Meeks <[email protected]> Date: Fri Feb 24 10:56:43 2012 +0000 android: calm basic warnings by packaging macros diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index f09cdb2..528174b 100644 --- a/android/qa/desktop/Makefile +++ b/android/qa/desktop/Makefile @@ -205,6 +205,13 @@ copy-stuff: buildrcs mkdir -p assets/presets/$$D ; \ echo "content" > assets/presets/$$D/stamp; \ done +# persuade Basic to be happy + mkdir -p assets/presets/basic/Standard + cp $(SRC_ROOT)/wizards/source/config/dialog.xlc assets/presets/basic/ + cp $(SRC_ROOT)/wizards/source/config/script.xlc assets/presets/basic/ + cp $(SRC_ROOT)/wizards/source/standard/Module1.xba assets/presets/basic/Standard/ + cp $(SRC_ROOT)/wizards/source/standard/dialog.xlb assets/presets/basic/Standard/ + cp $(SRC_ROOT)/wizards/source/standard/script.xlb assets/presets/basic/Standard/ # shell / splash images cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program # Then assets that are unpacked at run-time into the app's data directory. _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
