diff options
author | Jennifer Liebel <jliebel94@gmail.com> | 2014-11-17 09:18:52 +0000 |
---|---|---|
committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:34:58 +0000 |
commit | d843f3de731667a298a83fc66637c7f983f3b24d (patch) | |
tree | 7858b40511f16654d93828676991d8a4b84a044a /sd/source/ui/framework | |
parent | 821ae0fb9fa63e0171f987d5ec210ec121978b8f (diff) |
changed timers to idle
Change-Id: I92f40d3dad133347f1b8db0b025b624d3305f885
Diffstat (limited to 'sd/source/ui/framework')
-rw-r--r-- | sd/source/ui/framework/module/ShellStackGuard.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/framework/module/ShellStackGuard.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index de8ecb3e4478..cf72edc9d2a2 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -43,7 +43,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) mxConfigurationController(), mpBase(NULL), mpUpdateLock(), - maPrinterPollingTimer() + maPrinterPollingIdle() { Reference<XControllerManager> xControllerManager (rxController, UNO_QUERY); if (xControllerManager.is()) @@ -71,8 +71,8 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) Any()); // Prepare the printer polling. - maPrinterPollingTimer.SetTimeoutHdl(LINK(this,ShellStackGuard,TimeoutHandler)); - maPrinterPollingTimer.SetTimeout(300); + maPrinterPollingIdle.SetIdleHdl(LINK(this,ShellStackGuard,TimeoutHandler)); + maPrinterPollingIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER); } } @@ -101,7 +101,7 @@ void SAL_CALL ShellStackGuard::notifyConfigurationChange ( mpUpdateLock.reset(new ConfigurationController::Lock(mxConfigurationController)); // Start polling for the printer having finished printing. - maPrinterPollingTimer.Start(); + maPrinterPollingIdle.Start(); } } } @@ -121,7 +121,7 @@ void SAL_CALL ShellStackGuard::disposing ( IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer) { #ifdef DEBUG - OSL_ASSERT(pTimer==&maPrinterPollingTimer); + OSL_ASSERT(pTimer==&maPrinterPollingIdle); #else (void)pTimer; #endif @@ -135,7 +135,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer) else { // Wait long for the printing to finish. - maPrinterPollingTimer.Start(); + maPrinterPollingIdle.Start(); } } diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 44ea6a3dc62e..22aaaa732045 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -84,7 +84,7 @@ private: mxConfigurationController; ViewShellBase* mpBase; ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock; - Timer maPrinterPollingTimer; + Idle maPrinterPollingIdle; DECL_LINK(TimeoutHandler, Timer*); |