summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/shutdownicon.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/appl/shutdownicon.cxx')
-rw-r--r--sfx2/source/appl/shutdownicon.cxx19
1 files changed, 1 insertions, 18 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index d98b122c633d..6bd93b18e088 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -63,7 +63,6 @@
#include <unistd.h>
#include <errno.h>
#endif
-#include <vcl/timer.hxx>
#include <sfx2/sfxresid.hxx>
@@ -183,22 +182,6 @@ bool LoadModule()
}
-class IdleTerminate : Timer
-{
- ::com::sun::star::uno::Reference< XDesktop2 > m_xDesktop;
-public:
- IdleTerminate (::com::sun::star::uno::Reference< XDesktop2 > xDesktop)
- {
- m_xDesktop = xDesktop;
- Start();
- }
- virtual void Timeout() SAL_OVERRIDE
- {
- m_xDesktop->terminate();
- delete this;
- }
-};
-
void ShutdownIcon::initSystray()
{
if (m_bInitialized)
@@ -564,7 +547,7 @@ void ShutdownIcon::terminateDesktop()
// terminate desktop only if no tasks exist
::com::sun::star::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY );
if( xTasks.is() && xTasks->getCount() < 1 )
- new IdleTerminate( xDesktop );
+ Application::Quit();
// remove the instance pointer
ShutdownIcon::pShutdownIcon = 0;