make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

26 files changed, 40 insertions, 63 deletions

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 7520787b4fc7..c0d5c25b40fd 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -82,10 +82,10 @@ public:
     void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE;
     DECL_LINK(WindowEventListener, VclWindowEvent*);
     DECL_LINK(SelectionChangeListener, void*);
-    DECL_LINK(BroadcastSelectionChange, void*);
+    DECL_LINK_TYPED(BroadcastSelectionChange, void*, void);
     DECL_LINK(FocusChangeListener, void*);
     DECL_LINK(VisibilityChangeListener, void*);
-    DECL_LINK(UpdateChildrenCallback, void*);
+    DECL_LINK_TYPED(UpdateChildrenCallback, void*, void);
 
     void Activated();
 private:
@@ -699,7 +699,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren()
     if (mnUpdateChildrenUserEventId == 0)
         mnUpdateChildrenUserEventId = Application::PostUserEvent(
             LINK(this, AccessibleSlideSorterView::Implementation,
-            UpdateChildrenCallback));
+                 UpdateChildrenCallback));
 }
 
 void AccessibleSlideSorterView::Implementation::UpdateChildren()
@@ -928,14 +928,13 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListen
     return 1;
 }
 
-IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange)
+IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void)
 {
     mnSelectionChangeUserEventId = 0;
     mrAccessibleSlideSorter.FireAccessibleEvent(
         AccessibleEventId::SELECTION_CHANGED,
         Any(),
         Any());
-    return 1;
 }
 
 IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener)
@@ -981,12 +980,10 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener)
     return 1;
 }
 
-IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback)
+IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void)
 {
     mnUpdateChildrenUserEventId = 0;
     UpdateChildren();
-
-    return 1;
 }
 
 IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener)
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 36bf3318ac21..87ff4ba822dd 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -790,7 +790,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron )
     }
 }
 
-IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl)
+IMPL_LINK_NOARG_TYPED(AnnotationManagerImpl, UpdateTagsHdl, void*, void)
 {
     mnUpdateTagsEvent  = 0;
     DisposeTags();
@@ -802,8 +802,6 @@ IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl)
         static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles();
 
     invalidateSlots();
-
-    return 0;
 }
 
 void AnnotationManagerImpl::CreateTags()
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index b01b431e09a4..2eed181c6d90 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -96,7 +96,7 @@ public:
     void invalidateSlots();
 
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
-    DECL_LINK(UpdateTagsHdl, void *);
+    DECL_LINK_TYPED(UpdateTagsHdl, void *, void);
 
     void UpdateTags(bool bSynchron = false);
     void CreateTags();
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index f5a75cfc32cc..10c9274ecbbc 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -668,11 +668,10 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent)
     return sal_IntPtr(true);
 }
 
-IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl)
+IMPL_LINK_NOARG_TYPED(AnnotationTag, ClosePopupHdl, void*, void)
 {
     mnClosePopupEvent = 0;
     ClosePopup();
-    return 0;
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 036e682ff118..043708b40262 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -74,7 +74,7 @@ protected:
     virtual void deselect() SAL_OVERRIDE;
 
     DECL_LINK( WindowEventHandler, VclWindowEvent* );
-    DECL_LINK( ClosePopupHdl, void* );
+    DECL_LINK_TYPED( ClosePopupHdl, void*, void );
 
 private:
     AnnotationManagerImpl& mrManager;
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 27d69ec7d524..95939e11ab3d 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -58,7 +58,7 @@ private:
 
     void                        CheckSelectionState();
 
-                                DECL_LINK( PlayMusicHdl, void * );
+                                DECL_LINK_TYPED( PlayMusicHdl, void *, void );
 
     Idle                        maUpdateIdle;
 
@@ -96,7 +96,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
     }
 }
 
-IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
+IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void)
 {
     maUpdateIdle.Stop();
     mnPlaySoundEvent = 0;
@@ -159,8 +159,6 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
             }
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index bac890e5890c..a04069b58b4a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1366,12 +1366,11 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
 /**
  * Handler for Dragging
  */
-IMPL_LINK_NOARG(SdPageObjsTLB, ExecDragHdl)
+IMPL_LINK_NOARG_TYPED(SdPageObjsTLB, ExecDragHdl, void*, void)
 {
     // as link, then it is allowed to asynchronous, without ImpMouseMoveMsg on
     // the stack, delete the Navigator
     DoDrag();
-    return 0;
 }
 
 bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 0a0014a9b701..975e593ad27e 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -111,7 +111,7 @@ void ChangeRequestQueueProcessor::StartProcessing()
     }
 }
 
-IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent)
+IMPL_LINK_NOARG_TYPED(ChangeRequestQueueProcessor, ProcessEvent, void*, void)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
@@ -124,8 +124,6 @@ IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent)
         // Schedule the processing of the next event.
         StartProcessing();
     }
-
-    return 0;
 }
 
 void ChangeRequestQueueProcessor::ProcessOneEvent()
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index fa3b4d456b9c..696635d2e6c6 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -121,7 +121,7 @@ private:
 
     /** Callback function for the PostUserEvent() call.
     */
-    DECL_LINK(ProcessEvent,void*);
+    DECL_LINK_TYPED(ProcessEvent, void*, void);
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 7884da011526..3ef12728cc6f 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -278,7 +278,7 @@ protected:
 
                             DECL_LINK_TYPED( DropErrorHdl, Idle*, void );
                             DECL_LINK_TYPED( DropInsertFileHdl, Idle*, void );
-                            DECL_LINK( ExecuteNavigatorDrop, SdNavigatorDropEvent* );
+                            DECL_LINK_TYPED( ExecuteNavigatorDrop, void*, void );
 
     void ImplClearDrawDropMarker();
 
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 6b8c84b837bf..b68ff7ea84dd 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -163,7 +163,7 @@ protected:
         const SdrObject* pObject,
         const bool bCreate = true) const;
     void                    CloseBookmarkDoc();
-                            DECL_LINK(ExecDragHdl, void*);
+                            DECL_LINK_TYPED(ExecDragHdl, void*, void);
 
     /** Handle the reordering of entries in the navigator.  This method
         reorders both the involved shapes in their page as well as the
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index b8c1178a7ac2..59454e6a9be1 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -190,7 +190,7 @@ public:
 private:
     SlideShow( SdDrawDocument* pDoc );
 
-    DECL_LINK( StartInPlacePresentationConfigurationHdl, void * );
+    DECL_LINK_TYPED( StartInPlacePresentationConfigurationHdl, void *, void );
     void StartInPlacePresentationConfigurationCallback();
 
     void StartInPlacePresentation();
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 1259690dcc59..1d65446dec18 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -41,7 +41,7 @@ public:
     void UpdateTags();
 
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
-    DECL_LINK(UpdateTagsHdl, void *);
+    DECL_LINK_TYPED(UpdateTagsHdl, void *, void);
 
     bool CreateTags();
     bool DisposeTags();
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index 0f73676fff4b..134ef6251e44 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -87,7 +87,7 @@ void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll)
     }
 }
 
-IMPL_LINK_NOARG(CanvasUpdateRequester, Callback)
+IMPL_LINK_NOARG_TYPED(CanvasUpdateRequester, Callback, void*, void)
 {
     mnUserEventId = 0;
     if (mxCanvas.is())
@@ -95,7 +95,6 @@ IMPL_LINK_NOARG(CanvasUpdateRequester, Callback)
         mxCanvas->updateScreen(mbUpdateFlag);
         mbUpdateFlag = false;
     }
-    return 0;
 }
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index 35085a1e2fc8..abd1973f161e 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -62,7 +62,7 @@ private:
     css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas;
     ImplSVEvent * mnUserEventId;
     bool mbUpdateFlag;
-    DECL_LINK(Callback, void*);
+    DECL_LINK_TYPED(Callback, void*, void);
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 393774a334f9..82ad5b50c774 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -171,7 +171,7 @@ private:
     bool mbContainerCleaningPending;
 
     typedef ::std::pair<MasterPageContainerChangeEvent::EventType,Token> EventData;
-    DECL_LINK(AsynchronousNotifyCallback, EventData*);
+    DECL_LINK_TYPED(AsynchronousNotifyCallback, void*, void);
 
     Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize);
 
@@ -618,8 +618,9 @@ Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize
         return maLargePreviewSizePixel;
 }
 
-IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventData*, pData)
+IMPL_LINK_TYPED(MasterPageContainer::Implementation,AsynchronousNotifyCallback, void*, p, void)
 {
+    EventData* pData = static_cast<EventData*>(p);
     const ::osl::MutexGuard aGuard (maMutex);
 
     if (pData != NULL)
@@ -627,8 +628,6 @@ IMPL_LINK(MasterPageContainer::Implementation,AsynchronousNotifyCallback, EventD
         FireContainerChange(pData->first, pData->second);
         delete pData;
     }
-
-    return 0;
 }
 
 MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index cdf9b8401f9d..42417ad7ccaa 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -76,7 +76,7 @@ void SlideShowRestarter::Restart (bool bForce)
         LINK(this, SlideShowRestarter, EndPresentation));
 }
 
-IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
+IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void)
 {
     mnEventId = 0;
     if (mpSlideShow.is())
@@ -120,7 +120,6 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
             }
         }
     }
-    return 0;
 }
 
 void SlideShowRestarter::StartPresentation()
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 56a23b80030f..42b494c91fd0 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -75,7 +75,7 @@ private:
     */
     sal_Int32 GetDisplayCount();
 
-    DECL_LINK(EndPresentation, void*);
+    DECL_LINK_TYPED(EndPresentation, void*, void);
 
     /** Restart the presentation on the slide last shown before the restart
         was initiated.
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 4ec13bc8aeb7..46cec5f87145 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1077,11 +1077,10 @@ void SlideShow::StartInPlacePresentationConfigurationCallback()
     mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) );
 }
 
-IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl)
+IMPL_LINK_NOARG_TYPED(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void)
 {
     mnInPlaceConfigEvent = 0;
     StartInPlacePresentation();
-    return 0;
 }
 
 void SlideShow::StartInPlacePresentation()
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index bf369a235420..59cae0341c12 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1424,13 +1424,12 @@ void SlideshowImpl::endPresentation()
         mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
 }
 
-IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void)
 {
     mnEndShowEvent = 0;
 
     if( mxPresentation.is() )
         mxPresentation->end();
-    return 0;
 }
 
 void SAL_CALL SlideshowImpl::pause() throw (RuntimeException, std::exception)
@@ -2092,12 +2091,12 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt)
     }
 }
 
-IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
+IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void)
 {
     mnContextMenuEvent = 0;
 
     if( mpSlideController.get() == 0 )
-        return 0;
+        return;
 
     mbWasPaused = mbIsPaused;
     if( !mbWasPaused )
@@ -2223,7 +2222,6 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
 
     if( !mbWasPaused )
         resume();
-    return 0;
 }
 
 IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 6e1c2f0c3777..705e0a36e4e2 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -277,9 +277,9 @@ private:
     DECL_LINK_TYPED(updateHdl, Timer *, void);
     DECL_LINK( PostYieldListener, void* );
     DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void);
-    DECL_LINK( endPresentationHdl, void* );
+    DECL_LINK_TYPED( endPresentationHdl, void*, void );
     DECL_LINK( ContextMenuSelectHdl, Menu * );
-    DECL_LINK( ContextMenuHdl, void* );
+    DECL_LINK_TYPED( ContextMenuHdl, void*, void );
     DECL_LINK_TYPED(deactivateHdl, Timer *, void);
     DECL_LINK( EventListenerHdl, VclSimpleEvent* );
 
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 6511aa06909c..b270ac67a58c 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -578,7 +578,7 @@ void Clipboard::DragFinished (sal_Int8 nDropAction)
     }
 }
 
-IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData)
+IMPL_LINK_TYPED(Clipboard, ProcessDragFinished, void*, pUserData, void)
 {
     const sal_Int8 nDropAction (static_cast<sal_Int8>(reinterpret_cast<sal_IntPtr>(pUserData)));
 
@@ -607,8 +607,6 @@ IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData)
     }
     mxUndoContext.reset();
     mxSelectionObserverContext.reset();
-
-    return 1;
 }
 
 sal_Int8 Clipboard::AcceptDrop (
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 235d125e8540..5caeba792722 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -225,7 +225,7 @@ private:
     /** Asynchronous part of DragFinished.  The argument is the sal_Int8
         nDropAction, disguised as void*.
     */
-    DECL_LINK(ProcessDragFinished, void*);
+    DECL_LINK_TYPED(ProcessDragFinished, void*, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 4fe12fac0026..5c9bad5ef4a2 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -324,9 +324,9 @@ private:
     static OUString GetToolBarResourceName (const OUString& rsBaseName);
     bool CheckPlugInMode (const OUString& rsName) const;
 
-    DECL_LINK(UpdateCallback, void *);
+    DECL_LINK_TYPED(UpdateCallback, void *, void);
     DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*);
-    DECL_LINK(SetValidCallback,void*);
+    DECL_LINK_TYPED(SetValidCallback, void*, void);
 };
 
 //===== ToolBarManager ========================================================
@@ -848,7 +848,7 @@ void ToolBarManager::Implementation::Update (
     }
 }
 
-IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback)
+IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, void)
 {
     mnPendingUpdateCall = 0;
     if (mnLockCount == 0)
@@ -860,7 +860,6 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback)
         if (mbIsValid && mxLayouter.is())
             mpAsynchronousLayouterLock.reset();
     }
-    return 0;
 }
 
 IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback,
@@ -888,11 +887,10 @@ IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback,
     return 0;
 }
 
-IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback)
+IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, SetValidCallback, void*, void)
 {
     mnPendingSetValidCall = 0;
     SetValid(true);
-    return 0;
 }
 
 OUString ToolBarManager::Implementation::GetToolBarResourceName (
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 87bfa3680f35..7bb04352864f 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -807,8 +807,9 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
     return nRet;
 }
 
-IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent )
+IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void )
 {
+    SdNavigatorDropEvent*                   pSdNavigatorDropEvent = static_cast<SdNavigatorDropEvent*>(p);
     TransferableDataHelper                  aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable );
     SdPageObjsTLB::SdPageObjsTransferable*  pPageObjsTransferable = SdPageObjsTLB::SdPageObjsTransferable::getImplementation( aDataHelper.GetXTransferable() );
     INetBookmark                            aINetBookmark;
@@ -860,8 +861,6 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
     }
 
     delete pSdNavigatorDropEvent;
-
-    return 0;
 }
 
 bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 11ac62bfcf4b..4cdbd335d6b0 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -472,7 +472,7 @@ void ViewOverlayManager::UpdateTags()
         mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) );
 }
 
-IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl)
+IMPL_LINK_NOARG_TYPED(ViewOverlayManager, UpdateTagsHdl, void*, void)
 {
     OSL_TRACE("ViewOverlayManager::UpdateTagsHdl");
 
@@ -482,7 +482,6 @@ IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl)
 
     if( bChanges && mrBase.GetDrawView() )
         static_cast< ::sd::View* >( mrBase.GetDrawView() )->updateHandles();
-    return 0;
 }
 
 bool ViewOverlayManager::CreateTags()