desktop/unx/source/args.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit 3752aca388adaf633e21a47576c770d73bf7e8d3 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Sep 21 13:33:37 2012 +0200 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.me...@suse.com> Tested-by: Michael Meeks <michael.me...@suse.com> diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c index 0952911..0e01123 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; } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits