diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-08 15:49:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-08 15:53:49 +0100 |
| commit | db21197de4383f75718190072171adab15e64a00 (patch) | |
| tree | e96e1bf94a2ccec0a6d8ef0df3c450e679456652 /desktop | |
| parent | 74a6d7a135ca03c23eff8b360a748a8f964c92a3 (diff) | |
desktop: do not complain about soffice command line options:
These are handled in the soffice wrapper script, but that is too stupid
to be able to filter these out, so just ignore them in soffice.bin.
(regression from 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1)
Also, print errors on stderr.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 5ae86ab20480..0bc6312aff1a 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -306,10 +306,16 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) } #if defined UNX else + // because it's impossible to filter these options that + // are handled in the soffice shell script with the + // primitive tools that /bin/sh offers, ignore them here + if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) && + !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) && + !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind"))) { - printf("Unknown option %s\n", + fprintf(stderr, "Unknown option %s\n", rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr()); - printf("Run 'soffice --help' to see a full list of available command line options.\n"); + fprintf(stderr, "Run 'soffice --help' to see a full list of available command line options.\n"); SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True ); } #endif |