diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-21 13:33:37 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-21 15:31:21 +0000 |
commit | 3752aca388adaf633e21a47576c770d73bf7e8d3 (patch) | |
tree | 551ab697a05bbedaceb1391ce361455f4907b59e /desktop | |
parent | 363029af2207dc890939e31850aba82263c97ec6 (diff) |
Properly check cmdline args in oosplash
...so that e.g. --headless (starting with a "h") is not also mistaken as -h and
disables pagein and javaldx.
Change-Id: I8a7b2b0373d96ec586975e07e17e7eabe201dcd0
(cherry picked from commit b247950eeeb2ea2345633ee018fbe2c55c1942c0)
Reviewed-on: https://gerrit.libreoffice.org/666
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/unx/source/args.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c index 0952911b5763..0e01123cb242 100644 --- a/desktop/unx/source/args.c +++ b/desktop/unx/source/args.c @@ -126,14 +126,16 @@ Args *args_parse (void) } for ( j = 0; j < SAL_N_ELEMENTS (pArgDescr); ++j ) { - if (!rtl_ustr_indexOfAscii_WithLength - (arg, length, pArgDescr[j].name, strlen (pArgDescr[j].name))) { - + if (rtl_ustr_ascii_compare_WithLength( + arg, length, pArgDescr[j].name) + == 0) + { args->bInhibitSplash |= pArgDescr[j].bInhibitSplash; args->bInhibitPagein |= pArgDescr[j].bInhibitPagein; args->bInhibitJavaLdx |= pArgDescr[j].bInhibitJavaLdx; if (pArgDescr[j].pPageinType) args->pPageinType = pArgDescr[j].pPageinType; + break; } } } |