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.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx2
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.cxx4
-rw-r--r--sd/source/ui/animations/SlideTransitionPane.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.cxx3
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx11
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx6
-rw-r--r--sd/source/ui/inc/tools/AsynchronousCall.hxx2
-rw-r--r--sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.cxx6
-rw-r--r--sd/source/ui/sidebar/MasterPageContainerQueue.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx7
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx4
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx10
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx6
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx3
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx3
-rw-r--r--sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx3
-rw-r--r--sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsToolTip.cxx4
-rw-r--r--sd/source/ui/tools/AsynchronousCall.cxx5
-rw-r--r--sd/source/ui/tools/TimerBasedTaskExecution.cxx6
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx3
32 files changed, 46 insertions, 76 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 43da01c86479..779cf72c7da2 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2055,7 +2055,7 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl )
return 0;
}
-IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback)
+IMPL_LINK_NOARG_TYPED(CustomAnimationPane, lateInitCallback, Timer *, void)
{
// Call getPresets() to initiate the (expensive) construction of the
// presets list.
@@ -2063,8 +2063,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback)
// update selection and control states
onSelectionChanged();
-
- return 0;
}
void CustomAnimationPane::moveSelection( bool bUp )
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 5073040ed95a..0a1b87b6d5dc 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -119,7 +119,7 @@ private:
DECL_LINK( implControlHdl, Control* );
DECL_LINK(implPropertyHdl, void *);
DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
- DECL_LINK(lateInitCallback, void *);
+ DECL_LINK_TYPED(lateInitCallback, Timer *, void);
private:
ViewShellBase& mrBase;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 4a0419b08b73..0c41e0905296 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1067,7 +1067,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked)
return 0;
}
-IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void)
{
const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList();
TransitionPresetList::const_iterator aIter( rPresetList.begin() );
@@ -1089,8 +1089,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback)
updateSoundList();
updateControls();
-
- return 0;
}
vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame )
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index 63e76e3d1242..654ce2e8642e 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -99,7 +99,7 @@ private:
DECL_LINK( SoundListBoxSelected, void * );
DECL_LINK( LoopSoundBoxChecked, void * );
DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
- DECL_LINK(LateInitCallback, void *);
+ DECL_LINK_TYPED(LateInitCallback, Timer *, void);
ViewShellBase & mrBase;
SdDrawDocument * mpDrawDoc;
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index 5cc3a3a2fad8..298924f98a86 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -365,7 +365,7 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
mbUpdateBeingProcessed = bValue;
}
-IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler)
+IMPL_LINK_NOARG_TYPED(ConfigurationUpdater, TimeoutHandler, Timer *, void)
{
OSL_TRACE("configuration update timer");
if ( ! mbUpdateBeingProcessed
@@ -378,7 +378,6 @@ IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler)
RequestUpdate(mxRequestedConfiguration);
}
}
- return 0;
}
} } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 8c25b7575387..07f34c4b75c7 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -197,7 +197,7 @@ private:
*/
void UnlockUpdates();
- DECL_LINK(TimeoutHandler, void *);
+ DECL_LINK_TYPED(TimeoutHandler, Timer *, void);
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index d8da1447212b..e0ced626668a 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -177,15 +177,13 @@ void FuPoor::ForceScroll(const Point& aPixPos)
/**
* timer handler for window scrolling
*/
-IMPL_LINK_NOARG(FuPoor, ScrollHdl)
+IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void)
{
Point aPnt(mpWindow->GetPointerPosPixel());
// use remembered MouseButton state to create correct
// MouseEvents for this artificial MouseMove.
MouseMove(MouseEvent(aPnt, 1, MouseEventModifiers::NONE, GetMouseButtonCode()));
-
- return 0;
}
/**
@@ -956,7 +954,7 @@ void FuPoor::DoPasteUnformatted()
/**
* Timer handler for Drag&Drop
*/
-IMPL_LINK_NOARG(FuPoor, DragHdl)
+IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, Timer *, void)
{
if( mpView )
{
@@ -971,7 +969,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl)
mpView->StartDrag( aMDPos, mpWindow );
}
}
- return 0;
}
bool FuPoor::Command(const CommandEvent& rCEvt)
@@ -982,7 +979,7 @@ bool FuPoor::Command(const CommandEvent& rCEvt)
/**
* Timer handler for window scrolling
*/
-IMPL_LINK_NOARG(FuPoor, DelayHdl)
+IMPL_LINK_NOARG_TYPED(FuPoor, DelayHdl, Timer *, void)
{
aDelayToScrollTimer.Stop ();
bScrollable = true;
@@ -992,8 +989,6 @@ IMPL_LINK_NOARG(FuPoor, DelayHdl)
// use remembered MouseButton state to create correct
// MouseEvents for this artificial MouseMove.
MouseMove(MouseEvent(aPnt, 1, MouseEventModifiers::NONE, GetMouseButtonCode()));
-
- return 0;
}
bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index ad604e01bf88..e4a7d26a64b4 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -74,7 +74,7 @@ public:
when IsUICaptured() returns <TRUE/>.
*/
void Release (bool bForce = false);
- DECL_LINK(TimeoutCallback, void *);
+ DECL_LINK_TYPED(TimeoutCallback, Timer *, void);
private:
::std::unique_ptr<ToolBarManager::UpdateLock> mpLock;
/** The timer is used both as a safe guard to unlock the update lock
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index e40c36cbd587..72e88fd19b93 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -126,7 +126,7 @@ protected:
SfxRequest& rReq);
virtual ~FuPoor();
- DECL_LINK( DelayHdl, void * );
+ DECL_LINK_TYPED( DelayHdl, Timer *, void );
static void ImpForceQuadratic(Rectangle& rRect);
@@ -160,11 +160,11 @@ protected:
VclPtr<Dialog> pDialog;
Timer aScrollTimer; ///< for auto-scrolling
- DECL_LINK( ScrollHdl, void * );
+ DECL_LINK_TYPED( ScrollHdl, Timer *, void );
void ForceScroll(const Point& aPixPos);
Timer aDragTimer; ///< for Drag&Drop
- DECL_LINK(DragHdl, void *);
+ DECL_LINK_TYPED(DragHdl, Timer *, void);
bool bIsInDragMode;
Point aMDPos; ///< position of MouseButtonDown
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index 52bbb3ad8093..a95ad7f58ffd 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -74,7 +74,7 @@ private:
function is called the next time. This pointer may be NULL.
*/
::std::unique_ptr<AsynchronousFunction> mpFunction;
- DECL_LINK(TimerCallback,Timer*);
+ DECL_LINK_TYPED(TimerCallback,Timer*,void);
};
} } // end of namespace ::sd::tools
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index 1bf5ec72cf14..7880bd7ecde1 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -83,7 +83,7 @@ private:
class Deleter;
friend class Deleter;
- DECL_LINK(TimerCallback, void *);
+ DECL_LINK_TYPED(TimerCallback, Timer *, void);
};
} } // end of namespace ::sd::tools
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 4d6b78204928..d23c9f21246a 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -109,7 +109,7 @@ void MasterPageContainerQueue::LateInit()
{
// Set up the timer for the delayed creation of preview bitmaps.
maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout);
- Link<> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
+ Link<Timer *, void> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation));
maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink);
}
@@ -176,7 +176,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority (
return nPriority;
}
-IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer)
+IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void)
{
bool bIsShowingFullScreenShow (false);
bool bWaitForMoreRequests (false);
@@ -235,8 +235,6 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer)
maDelayedPreviewCreationTimer.SetTimeout(nTimeout);
pTimer->Start();
}
-
- return 0;
}
bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) const
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 150115b141bf..b60d2c03147c 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -123,7 +123,7 @@ private:
*/
static sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor);
- DECL_LINK(DelayedPreviewCreation, Timer *);
+ DECL_LINK_TYPED(DelayedPreviewCreation, Timer *, void);
};
} } // end of namespace sd::sidebar
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 601009602e85..fbf685fbfda2 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -556,7 +556,7 @@ void ShowWindow::DrawEndScene()
SetFont( aOldFont );
}
-IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer )
+IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void )
{
if( !( --mnPauseTimeout ) )
RestartShow();
@@ -565,11 +565,9 @@ IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer )
DrawPauseScene( true );
pTimer->Start();
}
-
- return 0L;
}
-IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void)
{
if( mbMouseCursorHidden )
{
@@ -583,7 +581,6 @@ IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl)
ShowPointer( false );
mbMouseCursorHidden = true;
}
- return 0L;
}
IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent*, pEvent )
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index ce524c867e3b..a9a5eabae831 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -107,8 +107,8 @@ private:
bool mbMouseCursorHidden;
sal_uInt64 mnFirstMouseMove;
- DECL_LINK( PauseTimeoutHdl, Timer* pTimer );
- DECL_LINK(MouseTimeoutHdl, void *);
+ DECL_LINK_TYPED( PauseTimeoutHdl, Timer*, void );
+ DECL_LINK_TYPED(MouseTimeoutHdl, Timer *, void);
DECL_LINK( EventHdl, VclWindowEvent* pEvent );
::rtl::Reference< SlideshowImpl > mxController;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 075d16e2db1a..f03a0e34fe32 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1775,19 +1775,18 @@ void SlideshowImpl::startUpdateTimer()
This is used to unfreeze user input that was disabled after
slide change to skip input that was buffered during slide
transition preparation */
-IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void)
{
mbInputFreeze = false;
- return 0;
}
/** if I catch someone someday who calls this method by hand
and not by using the timer, I will personaly punish this
person seriously, even if this person is me.
*/
-IMPL_LINK_NOARG(SlideshowImpl, updateHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void)
{
- return updateSlideShow();
+ updateSlideShow();
}
IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener)
@@ -2676,7 +2675,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio
}
}
-IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, deactivateHdl, Timer *, void)
{
if( mbActive && mxShow.is() )
{
@@ -2695,7 +2694,6 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl)
}
}
}
- return 0;
}
sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception)
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 2840465d6ae1..41270adc8028 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -274,13 +274,13 @@ private:
void setActiveXToolbarsVisible( bool bVisible );
- DECL_LINK(updateHdl, void *);
+ DECL_LINK_TYPED(updateHdl, Timer *, void);
DECL_LINK( PostYieldListener, void* );
- DECL_LINK(ReadyForNextInputHdl, void *);
+ DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void);
DECL_LINK( endPresentationHdl, void* );
DECL_LINK( ContextMenuSelectHdl, Menu * );
DECL_LINK( ContextMenuHdl, void* );
- DECL_LINK(deactivateHdl, void *);
+ DECL_LINK_TYPED(deactivateHdl, Timer *, void);
DECL_LINK( EventListenerHdl, VclSimpleEvent* );
// helper
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
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index f5bd0a1128e9..e3d6b0630156 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -27,7 +27,7 @@ AsynchronousCall::AsynchronousCall()
: maTimer(),
mpFunction()
{
- Link<> aCallback (LINK(this,AsynchronousCall,TimerCallback));
+ Link<Timer *, void> aCallback (LINK(this,AsynchronousCall,TimerCallback));
maTimer.SetTimeoutHdl(aCallback);
}
@@ -46,7 +46,7 @@ void AsynchronousCall::Post (
maTimer.Start();
}
-IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer)
+IMPL_LINK_TYPED(AsynchronousCall,TimerCallback,Timer*,pTimer,void)
{
if (pTimer == &maTimer)
{
@@ -54,7 +54,6 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer)
pFunction.swap(mpFunction);
(*pFunction)();
}
- return 0;
}
} } // end of namespace ::sd::tools
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 10f46a019fa6..a6b1299834ce 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -88,7 +88,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution (
mpSelf(),
mnMaxTimePerStep(nMaxTimePerStep)
{
- Link<> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
+ Link<Timer *, void> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback));
maTimer.SetTimeoutHdl(aLink);
maTimer.SetTimeout(nMillisecondsBetweenSteps);
maTimer.Start();
@@ -106,7 +106,7 @@ void TimerBasedTaskExecution::SetSelf (
mpSelf = rpSelf;
}
-IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback)
+IMPL_LINK_NOARG_TYPED(TimerBasedTaskExecution, TimerCallback, Timer *, void)
{
if (mpTask.get() != NULL)
{
@@ -132,8 +132,6 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback)
else
mpSelf.reset();
}
-
- return 0;
}
} } // end of namespace ::sd::tools
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 727b7c7b801b..73ea44f8e388 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -351,7 +351,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
maTimer.Start();
}
-IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback)
+IMPL_LINK_NOARG_TYPED(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void)
{
// If possible then release the lock now. Otherwise start the timer
// and try again later.
@@ -363,7 +363,6 @@ IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback)
{
mpSelf.reset();
}
- return 0;
}
void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce)