summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/slidesorter')
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsAnimator.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx2
8 files changed, 9 insertions, 9 deletions
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index 6e318c077a74..b9d3add376ae 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -124,7 +124,7 @@ CacheCompactor::CacheCompactor(
mbIsCompactionRunning(false)
{
maCompactionTimer.SetTimeout(100);
- maCompactionTimer.SetTimeoutHdl(LINK(this,CacheCompactor,CompactionCallback));
+ maCompactionTimer.SetInvokeHandler(LINK(this,CacheCompactor,CompactionCallback));
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 31a8a52b64d5..7d030d2a8e6d 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -58,7 +58,7 @@ std::shared_ptr<CacheConfiguration> CacheConfiguration::Instance()
rInstancePtr.reset(new CacheConfiguration());
mpWeakInstance = rInstancePtr;
// Prepare to release this instance in the near future.
- maReleaseTimer.SetTimeoutHdl(
+ maReleaseTimer.SetInvokeHandler(
LINK(rInstancePtr.get(),CacheConfiguration,TimerCallback));
maReleaseTimer.SetTimeout(5000 /* 5s */);
maReleaseTimer.Start();
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 67ab7e2f82f9..a4ba8dd088ee 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -58,7 +58,7 @@ QueueProcessor::QueueProcessor (
if (aTimeBetweenReqeusts.has<sal_Int32>())
aTimeBetweenReqeusts >>= mnTimeBetweenRequestsWhenNotIdle;
- maTimer.SetTimeoutHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
+ maTimer.SetInvokeHandler (LINK(this,QueueProcessor,ProcessRequestHdl));
maTimer.SetTimeout (10);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index d1791ad795ee..35c578f0aa3d 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -68,7 +68,7 @@ Animator::Animator (SlideSorter& rSlideSorter)
mnNextAnimationId(0)
{
maIdle.SetPriority(TaskPriority::REPAINT);
- maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler));
+ maIdle.SetInvokeHandler(LINK(this,Animator,TimeoutHandler));
}
Animator::~Animator()
@@ -211,7 +211,7 @@ void Animator::RequestNextFrame ()
}
}
-IMPL_LINK_NOARG(Animator, TimeoutHandler, Idle *, void)
+IMPL_LINK_NOARG(Animator, TimeoutHandler, Timer *, void)
{
if (mbIsDisposed)
return;
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index 6c026415b04f..40a8616adcd2 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -46,7 +46,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter)
maSwitchPageDelayTimer()
{
maSwitchPageDelayTimer.SetTimeout(100);
- maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback));
+ maSwitchPageDelayTimer.SetInvokeHandler(LINK(this,CurrentSlideManager,SwitchPageCallback));
}
CurrentSlideManager::~CurrentSlideManager()
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index f38ed105997c..e06b6359e11c 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -60,7 +60,7 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter)
mpScrollBarFiller->Hide();
maAutoScrollTimer.SetTimeout(25);
- maAutoScrollTimer.SetTimeoutHdl (
+ maAutoScrollTimer.SetInvokeHandler (
LINK(this, ScrollBarManager, AutoScrollTimeoutHandler));
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index ff127eace895..855994d7234c 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -100,7 +100,7 @@ private:
AnimationId mnNextAnimationId;
- DECL_LINK(TimeoutHandler, Idle *, void);
+ DECL_LINK(TimeoutHandler, Timer *, void);
/** Execute one step of every active animation.
@param nTime
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 4077e83068df..9dc22257667b 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -40,7 +40,7 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter)
sd::Window *window = rSlideSorter.GetContentWindow().get();
const HelpSettings& rHelpSettings = window->GetSettings().GetHelpSettings();
maShowTimer.SetTimeout(rHelpSettings.GetTipDelay());
- maShowTimer.SetTimeoutHdl(LINK(this, ToolTip, DelayTrigger));
+ maShowTimer.SetInvokeHandler(LINK(this, ToolTip, DelayTrigger));
maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay());
}