diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /sd/source/ui/slidesorter | |
parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'sd/source/ui/slidesorter')
12 files changed, 12 insertions, 21 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 55595e165bbd..ea0dc48d9264 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -132,7 +132,7 @@ CacheCompactor::CacheCompactor( } -IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) +IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void) { mbIsCompactionRunning = true; @@ -148,7 +148,6 @@ IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) } mbIsCompactionRunning = false; - return 1; } } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 481a92165cf2..783afecba1a0 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -80,7 +80,7 @@ private: */ Timer maCompactionTimer; bool mbIsCompactionRunning; - DECL_LINK(CompactionCallback, void *); + DECL_LINK_TYPED(CompactionCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 6baa2ef9b122..876dfcf738f9 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -137,12 +137,11 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } -IMPL_LINK_NOARG(CacheConfiguration, TimerCallback) +IMPL_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release out reference to the instance. rInstancePtr.reset(); - return 0; } } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index ff6cc9d2ee32..2ae271145510 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -57,7 +57,7 @@ private: CacheConfiguration(); - DECL_LINK(TimerCallback, void *); + DECL_LINK_TYPED(TimerCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 61a662f92982..212734e3df0b 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -106,10 +106,9 @@ void QueueProcessor::SetPreviewSize ( mbDoSuperSampling = bDoSuperSampling; } -IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) +IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Timer *, void) { ProcessRequests(); - return 1; } void QueueProcessor::ProcessRequests() diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index c472383def83..253bc11b2005 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -91,7 +91,7 @@ private: ::osl::Mutex maMutex; Timer maTimer; - DECL_LINK(ProcessRequestHdl, void *); + DECL_LINK_TYPED(ProcessRequestHdl, Timer *, void); sal_uInt32 mnTimeBetweenHighPriorityRequests; sal_uInt32 mnTimeBetweenLowPriorityRequests; sal_uInt32 mnTimeBetweenRequestsWhenNotIdle; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 61973a7e3d71..b14c36caff4b 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -239,7 +239,7 @@ void CurrentSlideManager::HandleModelChange() } } -IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) +IMPL_LINK_NOARG_TYPED(CurrentSlideManager, SwitchPageCallback, Timer *, void) { if (mpCurrentSlide) { @@ -253,8 +253,6 @@ IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) SetCurrentSlideAtViewShellBase(mpCurrentSlide); SetCurrentSlideAtXController(mpCurrentSlide); } - - return 1; } } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index eaa64571cf63..8c85255985b8 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -549,11 +549,9 @@ void ScrollBarManager::clearAutoScrollFunctor() maAutoScrollFunctor = ::boost::function<void()>(); } -IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) +IMPL_LINK_NOARG_TYPED(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void) { RepeatAutoScroll(); - - return 0; } void ScrollBarManager::Scroll( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 87651fcf3f8a..cb3f2b42771a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -110,7 +110,7 @@ private: */ void AcquireCurrentSlide (const sal_Int32 nSlideIndex); - DECL_LINK(SwitchPageCallback,void*); + DECL_LINK_TYPED(SwitchPageCallback, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 58899c8627d5..3c0761d33f96 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -246,7 +246,7 @@ private: DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); - DECL_LINK(AutoScrollTimeoutHandler, void *); + DECL_LINK_TYPED(AutoScrollTimeoutHandler, Timer *, void); void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index c24484b0c3cd..de1086c2755b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -68,7 +68,7 @@ private: void Show (const bool bForce); void DoShow(); - DECL_LINK(DelayTrigger, void*); + DECL_LINK_TYPED(DelayTrigger, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 97fa698bb7f7..d5c00c8b8177 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -154,11 +154,9 @@ bool ToolTip::Hide() return false; } -IMPL_LINK_NOARG(ToolTip, DelayTrigger) +IMPL_LINK_NOARG_TYPED(ToolTip, DelayTrigger, Timer *, void) { DoShow(); - - return 0; } } } } // end of namespace ::sd::slidesorter::view |