summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorTobias Madl <tobias.madl.dev@gmail.com>2015-01-14 13:11:28 +0000
committerTobias Madl <tobias.madl.dev@gmail.com>2015-03-06 12:27:06 +0000
commit256c5c3f28ef70b70d38e2e07dfca4baab654612 (patch)
treeaca2c7b00f0fe50f3a014ad4502e0ae8b7833f86 /sfx2/source
parent57656eb1fae5ae6c4d3b7542a385a93ff434e4e7 (diff)
Idle and Timer are now completely independent
And everything is functionating pretty well. Change-Id: Id7f5a995362f6f7c5235f2e9facb7c7f119f3140
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/appcfg.cxx8
-rw-r--r--sfx2/source/appl/appinit.cxx2
2 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 59ab0f950acb..7cae170a02af 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -91,7 +91,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
SfxEventAsyncer_Impl( const SfxEventHint& rHint );
virtual ~SfxEventAsyncer_Impl();
- DECL_LINK( TimerHdl, Timer*);
+ DECL_LINK( IdleHdl, Idle*);
};
@@ -114,7 +114,7 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint )
if( rHint.GetObjShell() )
StartListening( *rHint.GetObjShell() );
pIdle = new Idle;
- pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, TimerHdl) );
+ pIdle->SetIdleHdl( LINK(this, SfxEventAsyncer_Impl, IdleHdl) );
pIdle->SetPriority( IdlePriority::VCL_IDLE_PRIORITY_HIGHEST );
pIdle->Start();
}
@@ -128,10 +128,10 @@ SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl()
-IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
+IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle)
{
SfxObjectShellRef xRef( aHint.GetObjShell() );
- pAsyncTimer->Stop();
+ pAsyncIdle->Stop();
#ifdef DBG_UTIL
if (!xRef.Is())
{
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 9580a6433044..edc31e094955 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -47,6 +47,7 @@
#include <vcl/edit.hxx>
#include <vcl/timer.hxx>
+#include <vcl/idle.hxx>
#include <sfx2/unoctitm.hxx>
#include "app.hrc"
@@ -110,6 +111,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
// Timers may access the SfxApplication and are only deleted in
// Application::Quit(), which is asynchronous (PostUserEvent) - disable!
Timer::ImplDeInitTimer();
+ Idle::ImplDeInitIdle();
SfxApplication* pApp = SfxGetpApp();
pApp->Broadcast( SfxSimpleHint( SFX_HINT_DEINITIALIZING ) );