diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:57:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 13:57:28 +0000 |
| commit | 0a860eaf2f778b687c11be9ae36a30d35e055149 (patch) | |
| tree | 5698d31f2f6df3e85d8df82aa7a03903b1511007 /sfx2 | |
| parent | 7e9db2eae5fcee952e8e1d5a31edfc5925d3b052 (diff) | |
INTEGRATION: CWS lobeta3 (1.40.100); FILE MERGED
2005/02/18 10:33:28 cd 1.40.100.1: #i41022# Enable restart/reload of Quickstarter
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 3ed678d5d5ae..bb59d4fd436a 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shutdownicon.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: obo $ $Date: 2004-11-17 10:24:05 $ + * last change: $Author: rt $ $Date: 2005-03-29 14:57:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -542,6 +542,15 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : { ::osl::ClearableMutexGuard aGuard( m_aMutex ); + // third argument only sets veto, everything else will be ignored! + if (aArguments.getLength() > 2) + { + sal_Bool bVeto = sal_True; + bVeto = ::cppu::any2bool(aArguments[2]); + m_bVeto = bVeto; + return; + } + if ( aArguments.getLength() > 0 ) { if ( !ShutdownIcon::pShutdownIcon ) @@ -580,4 +589,5 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : if (!bAutostart && GetAutostart()) SetAutostart( sal_False ); } + } |