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-06 12:27:06 +0000 |
| commit | 57656eb1fae5ae6c4d3b7542a385a93ff434e4e7 (patch) | |
| tree | 7dc672090c6236ef7bd5a2bf5278cd03b89e2ef8 /cui | |
| parent | 49524c6dcf04b9dadef8d2b084cf26abcf70b8a9 (diff) | |
Idle and Timer are now completely independent
And everything is functionating pretty well.
Change-Id: Id7f5a995362f6f7c5235f2e9facb7c7f119f3140
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/backgrnd.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 8 | ||||
| -rw-r--r-- | cui/source/tabpages/macroass.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index ab4145fcece1..9e34d66218ee 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -137,7 +137,7 @@ private: bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); - DECL_LINK( LoadTimerHdl_Impl, Timer* ); + DECL_LINK( LoadIdleHdl_Impl, Idle* ); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(BrowseHdl_Impl, void *); DECL_LINK( RadioClickHdl_Impl, RadioButton* ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index cf0c3ff68ac4..62476bf25934 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -723,7 +723,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) if ( pPageImpl->pLoadIdle && pPageImpl->pLoadIdle->IsActive() ) { pPageImpl->pLoadIdle->Stop(); - LoadTimerHdl_Impl( pPageImpl->pLoadIdle ); + LoadIdleHdl_Impl( pPageImpl->pLoadIdle ); } // os: Such a nonsense! One will always find such an item somewhere, // but it must be existing in the rSet! @@ -1095,7 +1095,7 @@ void SvxBackgroundTabPage::ShowSelector() pPageImpl->pLoadIdle = new Idle; pPageImpl->pLoadIdle->SetPriority( IdlePriority::VCL_IDLE_PRIORITY_LOWEST ); pPageImpl->pLoadIdle->SetIdleHdl( - LINK( this, SvxBackgroundTabPage, LoadTimerHdl_Impl ) ); + LINK( this, SvxBackgroundTabPage, LoadIdleHdl_Impl ) ); bAllowShowSelector = false; @@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) -IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) +IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle ) /* [Description] @@ -1463,7 +1463,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer ) */ { - if ( pTimer == pPageImpl->pLoadIdle ) + if ( pIdle == pPageImpl->pLoadIdle ) { pPageImpl->pLoadIdle->Stop(); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index a4a23b23e75a..3a160a03b086 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -189,7 +189,7 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet ) void _SfxMacroTabPage::LaunchFillGroup() { - if (!mpImpl->maFillGroupIdle.GetTimeoutHdl().IsSet()) + if (!mpImpl->maFillGroupIdle.GetIdleHdl().IsSet()) { mpImpl->maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, _SfxMacroTabPage, TimeOut_Impl ) ); mpImpl->maFillGroupIdle.SetPriority( IdlePriority::VCL_IDLE_PRIORITY_HIGHEST ); |