diff options
| author | Hennes Rohling <hro@openoffice.org> | 2001-11-26 11:51:38 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2001-11-26 11:51:38 +0000 |
| commit | d94f361c9fb992613210f9d3743341b8b6a08c72 (patch) | |
| tree | d44a4aaeea59e616d097021ea55d6921d6a21dbe /sfx2/source/appl/shutdownicon.cxx | |
| parent | d04fc76adcd0c59dfeefbffd3add536da0f2cb2c (diff) | |
#93621# Disable modal menuentries in Quickstarter during execute of dispatch
Diffstat (limited to 'sfx2/source/appl/shutdownicon.cxx')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index c508aae8125a..e1bec3a5a7b6 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shutdownicon.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: mba $ $Date: 2001-11-21 14:54:18 $ + * last change: $Author: hro $ $Date: 2001-11-26 12:51:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,7 +132,9 @@ public: void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException ) { - ShutdownIcon* pIcon = ShutdownIcon::getInstance(); +#ifdef WNT + ShutdownIcon::LeaveModalMode(); +#endif } void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& aEvent ) throw( RuntimeException ) @@ -341,7 +343,12 @@ void ShutdownIcon::FromTemplate() pArg[0].Value <<= ::rtl::OUString::createFromAscii("private:user"); Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); if ( xNotifyer.is() ) + { +#ifdef WNT + EnterModalMode(); +#endif xNotifyer->dispatchWithNotification( aTargetURL, aArgs, new SfxNotificationListener_Impl() ); + } else xDisp->dispatch( aTargetURL, aArgs ); } |