summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx4
-rw-r--r--sd/source/ui/dlg/filedlg.cxx6
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx2
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.cxx4
-rw-r--r--sd/source/ui/framework/module/ShellStackGuard.hxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx6
-rw-r--r--sd/source/ui/inc/BreakDlg.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx4
-rw-r--r--sd/source/ui/slideshow/showwin.cxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx6
-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
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx3
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx3
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx4
-rw-r--r--sd/source/ui/view/sdview4.cxx4
26 files changed, 40 insertions, 42 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 319d9b45e6d2..5d2697a1952f 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -233,7 +233,7 @@ void CustomAnimationPane::initialize()
// Wait a short time before the presets list is created. This gives the
// system time to paint the control.
maLateInitTimer.SetTimeout(100);
- maLateInitTimer.SetTimeoutHdl(LINK(this, CustomAnimationPane, lateInitCallback));
+ maLateInitTimer.SetInvokeHandler(LINK(this, CustomAnimationPane, lateInitCallback));
maLateInitTimer.Start();
UpdateLook();
}
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 05a173449875..b62fa85b84f7 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -496,7 +496,7 @@ void SlideTransitionPane::Initialize(SdDrawDocument* pDoc)
addListener();
maLateInitTimer.SetTimeout(200);
- maLateInitTimer.SetTimeoutHdl(LINK(this, SlideTransitionPane, LateInitCallback));
+ maLateInitTimer.SetInvokeHandler(LINK(this, SlideTransitionPane, LateInitCallback));
maLateInitTimer.Start();
UpdateLook();
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index cdb2448d1e39..6f8fee9961bf 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -48,7 +48,7 @@ BreakDlg::BreakDlg(
, mpProgress( nullptr )
{
m_aUpdateIdle.SetPriority( TaskPriority::REPAINT );
- m_aUpdateIdle.SetIdleHdl( LINK( this, BreakDlg, InitialUpdate ) );
+ m_aUpdateIdle.SetInvokeHandler( LINK( this, BreakDlg, InitialUpdate ) );
m_aUpdateIdle.SetDebugName( "sd::BreakDlg m_aUpdateIdle" );
get(m_pFiObjInfo, "metafiles");
@@ -171,7 +171,7 @@ short BreakDlg::Execute()
/**
* link-method which starts the working function
*/
-IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Idle *, void)
+IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Timer *, void)
{
pDrView->DoImportMarkedMtf(pProgrInfo);
EndDialog(RET_OK);
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index bcf391323026..27a8c12af781 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -59,7 +59,7 @@ private:
void CheckSelectionState();
DECL_LINK( PlayMusicHdl, void *, void );
- DECL_LINK( IsMusicStoppedHdl, Idle *, void );
+ DECL_LINK( IsMusicStoppedHdl, Timer *, void );
public:
explicit SdFileDialog_Imp();
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
}
}
-IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
+IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Timer *, void)
{
SolarMutexGuard aGuard;
@@ -213,7 +213,7 @@ SdFileDialog_Imp::SdFileDialog_Imp() :
mbUsableSelection( false ),
mbLabelPlaying(false)
{
- maUpdateIdle.SetIdleHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
+ maUpdateIdle.SetInvokeHandler(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
maUpdateIdle.SetDebugName( "SdFileDialog_Imp maUpdateIdle" );
css::uno::Reference < css::ui::dialogs::XFilePicker2 > xFileDlg = GetFilePicker();
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 5c12a3cef62b..4535061fb7f7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -77,7 +77,7 @@ ConfigurationUpdater::ConfigurationUpdater (
// and the requested configuration differ. With the timer we try
// updates until the two configurations are the same.
maUpdateTimer.SetTimeout(snNormalTimeout);
- maUpdateTimer.SetTimeoutHdl(LINK(this,ConfigurationUpdater,TimeoutHandler));
+ maUpdateTimer.SetInvokeHandler(LINK(this,ConfigurationUpdater,TimeoutHandler));
mxControllerManager = rxControllerManager;
}
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index 7022b91dde2c..e41c7c10f396 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -71,7 +71,7 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController)
Any());
// Prepare the printer polling.
- maPrinterPollingIdle.SetIdleHdl(LINK(this,ShellStackGuard,TimeoutHandler));
+ maPrinterPollingIdle.SetInvokeHandler(LINK(this,ShellStackGuard,TimeoutHandler));
maPrinterPollingIdle.SetPriority(TaskPriority::LOWER);
}
}
@@ -118,7 +118,7 @@ void SAL_CALL ShellStackGuard::disposing (
}
}
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pIdle, void)
{
#ifdef DEBUG
OSL_ASSERT(pIdle==&maPrinterPollingIdle);
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index c2281253286d..2cdba472f5e2 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -83,7 +83,7 @@ private:
std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
Idle maPrinterPollingIdle;
- DECL_LINK(TimeoutHandler, Idle*, void);
+ DECL_LINK(TimeoutHandler, Timer*, void);
/** Return <TRUE/> when the printer is printing. Return <FALSE/> when
the printer is not printing, or there is no printer, or something
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 7ef6ab46b3b4..4e11571eac0b 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -84,13 +84,13 @@ FuPoor::FuPoor (
{
ReceiveRequest(rReq);
- aScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, ScrollHdl) );
+ aScrollTimer.SetInvokeHandler( LINK(this, FuPoor, ScrollHdl) );
aScrollTimer.SetTimeout(SELENG_AUTOREPEAT_INTERVAL);
- aDragTimer.SetTimeoutHdl( LINK(this, FuPoor, DragHdl) );
+ aDragTimer.SetInvokeHandler( LINK(this, FuPoor, DragHdl) );
aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT);
- aDelayToScrollTimer.SetTimeoutHdl( LINK(this, FuPoor, DelayHdl) );
+ aDelayToScrollTimer.SetInvokeHandler( LINK(this, FuPoor, DelayHdl) );
aDelayToScrollTimer.SetTimeout(2000);
}
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 1f37322bc3f0..55faf6cb2d32 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -72,7 +72,7 @@ private:
DECL_LINK( CancelButtonHdl, Button*, void );
DECL_LINK( UpDate, void*, bool );
- DECL_LINK( InitialUpdate, Idle*, void );
+ DECL_LINK( InitialUpdate, Timer*, void );
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 512c4fba2207..e19b7b3a302e 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -250,8 +250,8 @@ protected:
sal_uInt16 mnLockRedrawSmph;
bool mbIsDropAllowed;
- DECL_LINK( DropErrorHdl, Idle*, void );
- DECL_LINK( DropInsertFileHdl, Idle*, void );
+ DECL_LINK( DropErrorHdl, Timer*, void );
+ DECL_LINK( DropInsertFileHdl, Timer*, void );
DECL_LINK( ExecuteNavigatorDrop, void*, void );
void ImplClearDrawDropMarker();
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 7fdafe6aa5ab..3fe735570268 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -109,8 +109,8 @@ void MasterPageContainerQueue::LateInit()
{
// Set up the timer for the delayed creation of preview bitmaps.
maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout);
- Link<Timer *, void> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
- maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink);
+ maDelayedPreviewCreationTimer.SetInvokeHandler(
+ LINK(this,MasterPageContainerQueue,DelayedPreviewCreation) );
}
bool MasterPageContainerQueue::RequestPreview (const SharedMasterPageDescriptor& rpDescriptor)
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index d4e2d4ccb1c4..2ca0044f301f 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -65,9 +65,9 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc
// set HelpId
SetHelpId( HID_SD_WIN_PRESENTATION );
- maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) );
+ maPauseTimer.SetInvokeHandler( LINK( this, ShowWindow, PauseTimeoutHdl ) );
maPauseTimer.SetTimeout( 1000 );
- maMouseTimer.SetTimeoutHdl( LINK( this, ShowWindow, MouseTimeoutHdl ) );
+ maMouseTimer.SetInvokeHandler( LINK( this, ShowWindow, MouseTimeoutHdl ) );
maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index e24f0a918f27..f34d6972e312 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -510,14 +510,14 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
if( mpViewShell )
mpOldActiveWindow = mpViewShell->GetActiveWindow();
- maUpdateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, updateHdl));
+ maUpdateTimer.SetInvokeHandler(LINK(this, SlideshowImpl, updateHdl));
// Priority must not be too high or we'll starve input handling etc.
maUpdateTimer.SetPriority(TaskPriority::REPAINT);
- maDeactivateTimer.SetTimeoutHdl(LINK(this, SlideshowImpl, deactivateHdl));
+ maDeactivateTimer.SetInvokeHandler(LINK(this, SlideshowImpl, deactivateHdl));
maDeactivateTimer.SetTimeout( 20 );
- maInputFreezeTimer.SetTimeoutHdl( LINK( this, SlideshowImpl, ReadyForNextInputHdl ) );
+ maInputFreezeTimer.SetInvokeHandler( LINK( this, SlideshowImpl, ReadyForNextInputHdl ) );
maInputFreezeTimer.SetTimeout( 20 );
SvtSaveOptions aOptions;
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());
}
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 7208db4f2129..633ebadf8720 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -27,8 +27,7 @@ AsynchronousCall::AsynchronousCall()
: maTimer(),
mpFunction()
{
- Link<Timer *, void> aCallback (LINK(this,AsynchronousCall,TimerCallback));
- maTimer.SetTimeoutHdl(aCallback);
+ maTimer.SetInvokeHandler( LINK(this,AsynchronousCall,TimerCallback) );
}
AsynchronousCall::~AsynchronousCall()
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index f61823b31d6a..e2a8385d0dd0 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -89,8 +89,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution (
mpSelf(),
mnMaxTimePerStep(nMaxTimePerStep)
{
- Link<Timer *, void> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
- maTimer.SetTimeoutHdl(aLink);
+ maTimer.SetInvokeHandler( LINK(this,TimerBasedTaskExecution,TimerCallback) );
maTimer.SetTimeout(nMillisecondsBetweenSteps);
maTimer.Start();
}
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 87f03b9b65f4..ac8e4a0a3133 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -343,7 +343,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
{
// Start a timer that will unlock the ToolBarManager update lock when
// that is not done explicitly by calling Release().
- maTimer.SetTimeoutHdl(LINK(this,ToolBarManagerLock,TimeoutCallback));
+ maTimer.SetInvokeHandler(LINK(this,ToolBarManagerLock,TimeoutCallback));
maTimer.SetTimeout(100);
maTimer.Start();
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 66b0ef5abc32..2ff577af78a6 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -142,9 +142,9 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
SetMeasureLayer(SD_RESSTR(STR_LAYER_MEASURELINES));
// Timer for delayed drop (has to be for MAC)
- maDropErrorIdle.SetIdleHdl( LINK(this, View, DropErrorHdl) );
+ maDropErrorIdle.SetInvokeHandler( LINK(this, View, DropErrorHdl) );
maDropErrorIdle.SetPriority(TaskPriority::MEDIUM);
- maDropInsertFileIdle.SetIdleHdl( LINK(this, View, DropInsertFileHdl) );
+ maDropInsertFileIdle.SetInvokeHandler( LINK(this, View, DropInsertFileHdl) );
maDropInsertFileIdle.SetPriority(TaskPriority::MEDIUM);
}
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 5fffe0460c1a..060760ce4948 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -385,7 +385,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
/**
* Timer handler for InsertFile at Drop()
*/
-IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
{
DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" );
if( !mpViewSh )
@@ -576,7 +576,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void)
/**
* Timer handler for Errorhandling at Drop()
*/
-IMPL_LINK_NOARG(View, DropErrorHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropErrorHdl, Timer *, void)
{
ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
}