diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-25 10:15:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-26 11:30:35 +0200 |
| commit | f4a4ba9ac1b58b4726825400e1edd1bf47d4080a (patch) | |
| tree | bac77ca71f40262110433cb4e53fbcb5dc54a42c /desktop/source/app/cmdlineargs.hxx | |
| parent | 4972652eeba3ffa4d5055493d9275cfdc27b247c (diff) | |
Clean up option processing
* Support --version on non-UNX, too.
* Consistently show the first unknown option and the help blob in the presence
of any unknown options.
* There is no need to tunnel --help/--version past oosplash in the soffice
script, as oosplash is prepared to treat them adequately (esp. not pass them
over any pipe); this only added unnecessary variance to what spellings exactly
are supported and how mixtures of --help, --version, and unknown options are
handled.
Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f
Diffstat (limited to 'desktop/source/app/cmdlineargs.hxx')
| -rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index c6286d2ba895..c8576435187c 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -93,9 +93,10 @@ class CommandLineArgs: private boost::noncopyable bool IsWeb() const; bool IsVersion() const; bool HasModuleParam() const; - bool HasUnknown() const; bool WantsToLoadDocument() const; + OUString GetUnknown() const; + // Access to string parameters bool HasSplashPipe() const; std::vector< rtl::OUString > const & GetAccept() const; @@ -153,9 +154,10 @@ class CommandLineArgs: private boost::noncopyable bool m_helpbase; bool m_psn; bool m_version; - bool m_unknown; bool m_splashpipe; + OUString m_unknown; + bool m_bEmpty; // No Args at all bool m_bDocumentArgs; // A document creation/open/load arg is used std::vector< rtl::OUString > m_accept; |