summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-01-01 13:39:14 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-01 13:54:18 +0100
commit58f48448cfb24bd6baa95a8e09e9739fcd3cb485 (patch)
tree3bf1aea1952f54031c8eb9be29dff06f8cc4c1bb
parent5f1fc3d547b2b51d247918e43155e1a44dbf03a0 (diff)
desktop: adapt pArgDescr to CommandLineArgs::ParseCommandLine_Impl()
Commit fe5527f1c6dc259af464a0593e86a2da2983b7ed (desktop, sysui: let --convert-to imply --headless, 2014-12-22) changed CommandLineArgs::ParseCommandLine_Impl(), so that --convert-to implies --headless. However, that worked only when ./soffice.bin was launched; when the ./soffice wrapper started oosplash, then a logo was still shown, as oosplash has its own list of switches that disable the splash screen. Fix the inconsistency by adding "convert-to" to oosplash's list as well. Change-Id: I47e30db3b658f179f10e8a447b5d7cea083fcc60
-rw-r--r--desktop/unx/source/args.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 77fe3d870999..f4c75d54474a 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -38,6 +38,7 @@ static struct {
{ "invisible", 0, 1, 0, 0, 0, NULL },
{ "quickstart", 0, 1, 0, 0, 0, NULL },
{ "minimized", 0, 1, 0, 0, 0, NULL },
+ { "convert-to", 0, 1, 0, 0, 0, NULL },
/* pagein bits */
{ "writer", 0, 0, 0, 0, 0, "pagein-writer" },