diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 15:36:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 15:36:48 +0000 |
| commit | 509d6bd47e61201d798978294cdc30968c19ad43 (patch) | |
| tree | c85f5425470db58d2f46e4f6d1414c5fd8e2a70a /sfx2/source/appl | |
| parent | d79ccef322951540bf438e645b24bc9302ea7a8c (diff) | |
INTEGRATION: CWS os2port01 (1.46.16); FILE MERGED
2007/09/06 12:28:23 obr 1.46.16.3: build fix
2007/09/03 09:37:54 obr 1.46.16.2: RESYNC: (1.46-1.59); FILE MERGED
2006/12/28 15:05:01 ydario 1.46.16.1: OS/2 initial import.
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index d0376f599ef7..dc52aa4ab57f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shutdownicon.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: rt $ $Date: 2007-07-06 12:31:36 $ + * last change: $Author: vg $ $Date: 2007-09-20 16:36:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -704,6 +704,19 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : /* Create a sub-classed instance - foo */ ShutdownIcon::pShutdownIcon = this; initSystray(); +#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&) { @@ -808,6 +821,9 @@ rtl::OUString ShutdownIcon::getShortcutName() bool ShutdownIcon::GetAutostart( ) { +#if defined(OS2) + return GetAutostartOs2( ); +#else bool bRet = false; #ifdef ENABLE_QUICKSTART_APPLET OUString aShortcut( getShortcutName() ); @@ -822,6 +838,7 @@ bool ShutdownIcon::GetAutostart( ) } #endif // ENABLE_QUICKSTART_APPLET return bRet; +#endif } void ShutdownIcon::SetAutostart( bool bActivate ) @@ -865,6 +882,8 @@ void ShutdownIcon::SetAutostart( bool bActivate ) pIcon->deInitSystray(); #endif } +#elif defined OS2 + SetAutostartOs2( bActivate ); #else (void)bActivate; // unused variable #endif // ENABLE_QUICKSTART_APPLET |