diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:51:23 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:51:23 +0000 |
| commit | 673134cc0f3285ebbb0db3d8cde858fd63cb3620 (patch) | |
| tree | 391e81e8de23903a804508f6c8260c33555f0a59 /sfx2 | |
| parent | 97390e2e103c182bad43e944425986b247de3983 (diff) | |
INTEGRATION: CWS os2port03 (1.61.96); FILE MERGED
2008/07/17 05:26:20 obr 1.61.96.2: RESYNC: (1.61-1.63); FILE MERGED
2008/04/17 14:26:22 ydario 1.61.96.1: Issue number: i85203
Submitted by: ydario
Reviewed by: ydario
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 0afb63e3c849..4982d78d9124 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shutdownicon.cxx,v $ - * $Revision: 1.63 $ + * $Revision: 1.64 $ * * This file is part of OpenOffice.org. * @@ -671,6 +671,19 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : ShutdownIcon::getInstance()->addTerminateListener(); } #endif +#ifdef OS2 + // above win32 starts the quickstart thread, but we have + // quickstart running only when -quickstart is specified + // on command line (next boot). + // so if -quickstart was not specified, we cannot issue + // quickstart veto on shutdown. + if (bQuickstart) + { + // disable shutdown + ShutdownIcon::getInstance()->SetVeto( true ); + ShutdownIcon::getInstance()->addTerminateListener(); + } +#endif } catch(const ::com::sun::star::lang::IllegalArgumentException&) { |