diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-22 10:07:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-22 10:07:33 +0000 |
| commit | df43a07da8f7f29942c6f1624c7dfb8c86d92e44 (patch) | |
| tree | e72103a4f02c8b9627259da5fe321d732a33cb53 /desktop | |
| parent | 927e1b2cc6cf81c5bcf428a572051483c7142308 (diff) | |
INTEGRATION: CWS fwkrc32 (1.117.2); FILE MERGED
2003/07/18 13:31:23 lo 1.117.2.2: RESYNC: (1.117-1.118); FILE MERGED
2003/07/14 11:08:12 lo 1.117.2.1: #110837# use _exit() after displaying cmdline help
#110807# display OEM dialog at earlier time at startup
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 3ab00788fcba..626d9aafd035 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: app.cxx,v $ * - * $Revision: 1.120 $ + * $Revision: 1.121 $ * - * last change: $Author: vg $ $Date: 2003-07-22 08:26:21 $ + * last change: $Author: vg $ $Date: 2003-07-22 11:07:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -588,7 +588,7 @@ void Desktop::Init() // check whether we need to print cmdline help if ( pCmdLineArgs->IsHelp() ) { displayCmdlineHelp(); - exit(0); + _exit(0); } #endif // start ipc thread only for non-remote offices @@ -1386,6 +1386,13 @@ void Desktop::Main() Application::SetSettings( aSettings ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} set locale settings" ); + // if we need to display the OEM dialog, we need to do it here + if (!pCmdLineArgs->IsQuickstart() && !Desktop::CheckOEM()) + { + //Application::PostUserEvent( STATIC_LINK( 0, Desktop, AsyncTerminate ) ); + return; + } + if (pCmdLineArgs->IsEmpty()) { ::desktop::Desktop::bSuppressOpenDefault = sal_True; @@ -1748,12 +1755,6 @@ void Desktop::OpenClients() Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory(); - // if we need to display the OEM dialog, we need to do it here - if (!pArgs->IsQuickstart() && !Desktop::CheckOEM()) - { - Application::PostUserEvent( STATIC_LINK( 0, Desktop, AsyncTerminate ) ); - } - if (!pArgs->IsQuickstart()) { sal_Bool bShowHelp = sal_False; ::rtl::OUStringBuffer aHelpURLBuffer; |