summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-25 10:15:15 +0200
committerNoel Power <noel.power@suse.com>2012-09-26 19:37:47 +0000
commit81a441c695f01bb67fcf41120d5843660d7531fc (patch)
treeabc25b121f0a9db7c8ded8ee8c665d388a0f1d02 /vcl
parentf665c41f2dfeedeee34f2a7024432083ed809a18 (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. (cherry picked from commit f4a4ba9ac1b58b4726825400e1edd1bf47d4080a) Change-Id: I617f2e727e2f0eafd34a2de3b85d441c6783ec4f Reviewed-on: https://gerrit.libreoffice.org/700 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/vcl/svapp.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index af766f4a9762..9e1d88d9cbf0 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -111,9 +111,9 @@ class VCL_DLLPUBLIC ApplicationEvent
{
public:
enum Type {
- TYPE_ACCEPT, TYPE_APPEAR, TYPE_HELP, TYPE_OPEN, TYPE_OPENHELPURL,
- TYPE_PRINT, TYPE_PRIVATE_DOSHUTDOWN, TYPE_QUICKSTART, TYPE_SHOWDIALOG,
- TYPE_UNACCEPT
+ TYPE_ACCEPT, TYPE_APPEAR, TYPE_HELP, TYPE_VERSION, TYPE_OPEN,
+ TYPE_OPENHELPURL, TYPE_PRINT, TYPE_PRIVATE_DOSHUTDOWN, TYPE_QUICKSTART,
+ TYPE_SHOWDIALOG, TYPE_UNACCEPT
};
ApplicationEvent() {}