diff options
| author | Andreas Schlüns <as@openoffice.org> | 2002-05-24 08:40:34 +0000 |
|---|---|---|
| committer | Andreas Schlüns <as@openoffice.org> | 2002-05-24 08:40:34 +0000 |
| commit | a8bcdd8ef8926382803c1a11f742e84dc58c1311 (patch) | |
| tree | fa048b6df8b5f13a67be1374ac228372ac476466 /sfx2 | |
| parent | 68f61ca6f1149a1b24a4ac3dba19add626a42085 (diff) | |
dont use deprecated tasks supplier
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 542305b9e94d..6c0ebdacb51b 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shutdownicon.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cd $ $Date: 2002-04-23 06:32:22 $ + * last change: $Author: as $ $Date: 2002-05-24 09:40:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,8 +75,8 @@ #ifndef _COM_SUN_STAR_FRAME_XNOTIFYINGDISPATCH_HPP_ #include <com/sun/star/frame/XNotifyingDispatch.hpp> #endif -#ifndef _COM_SUN_STAR_FRAME_XTASKSSUPPLIER_HPP_ -#include <com/sun/star/frame/XTasksSupplier.hpp> +#ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_ +#include <com/sun/star/frame/XFramesSupplier.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include <com/sun/star/frame/XComponentLoader.hpp> @@ -453,19 +453,12 @@ void ShutdownIcon::terminateDesktop() getInstance()->m_xDesktop->removeTerminateListener( getInstance() ); // terminate desktop only if no tasks exist - Reference < XTasksSupplier > xTasksSupplier( getInstance()->m_xDesktop, UNO_QUERY ); + Reference < XFramesSupplier > xTasksSupplier( getInstance()->m_xDesktop, UNO_QUERY ); if( xTasksSupplier.is() ) { - Reference < XEnumerationAccess > xEnum = xTasksSupplier->getTasks(); - if( xEnum.is() ) - { - Reference < XElementAccess > xElement ( xEnum, UNO_QUERY ); - if ( xElement.is() ) - { - if( !xElement->hasElements() ) - getInstance()->m_xDesktop->terminate(); - } - } + Reference < XElementAccess > xCont( xTasksSupplier->getFrames(), UNO_QUERY ); + if( !xCont->hasElements() ) + getInstance()->m_xDesktop->terminate(); } } } |