diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-01-14 13:11:28 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2015-03-03 14:05:00 +0000 |
| commit | d516139f4f5395b7a6a944b3ebd4c718c19d245d (patch) | |
| tree | 055239accd1a79a171eb38cfe775c89cafe3bb40 | |
| parent | 59cbdcd6365a457275391c5298e932ab231e6c58 (diff) | |
Idle and Timer are now completely independent
And everything is functionating pretty well.
Change-Id: Id7f5a995362f6f7c5235f2e9facb7c7f119f3140
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 |
3 files changed, 8 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 ) ); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 49703e49b1bb..6ca6919ac69f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -33,6 +33,7 @@ #include "vcl/svapp.hxx" #include "vcl/wrkwin.hxx" #include "vcl/cvtgrf.hxx" +#include "vcl/idle.hxx" #include "vcl/image.hxx" #include "vcl/settings.hxx" #include "vcl/unowrap.hxx" @@ -387,6 +388,7 @@ void DeInitVCL() if ( pSVData->maAppData.mpIdleMgr ) delete pSVData->maAppData.mpIdleMgr; Timer::ImplDeInitTimer(); + Idle::ImplDeInitIdle; if ( pSVData->maWinData.mpMsgBoxImgList ) { |