make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

21 files changed, 53 insertions, 80 deletions

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 6e5381bad7fc..9bced5a872cc 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -182,7 +182,7 @@ public:
                    const com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > &rxDispatch = com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >(),
                    const com::sun::star::util::URL &rURL = com::sun::star::util::URL() );
 
-    DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo* );
+    DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void );
 };
 
 #endif
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index c5a9c446186e..7fba848455e5 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -375,7 +375,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     return DND_ACTION_LINK;
 }
 
-IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
+IMPL_LINK_NOARG_TYPED( FmGridHeader, OnAsyncExecuteDrop, void*, void )
 {
     OUString             sCommand, sFieldName,sURL;
     sal_Int32                   nCommandType = CommandType::COMMAND;
@@ -402,7 +402,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
         {
             ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet);
             ::comphelper::disposeComponent(m_pImpl->xDroppedStatement);
-            return 0L;
+            return;
         }
 
         // Vom Feld werden nun zwei Informationen benoetigt:
@@ -420,7 +420,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
             case DataType::OTHER:
                 ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet);
                 ::comphelper::disposeComponent(m_pImpl->xDroppedStatement);
-                return 0L;
+                return;
         }
 
         // Erstellen der Column
@@ -527,7 +527,7 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
             ::comphelper::disposeComponent(xCol);   // in case only the creation of the second column failed
             ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet);
             ::comphelper::disposeComponent(m_pImpl->xDroppedStatement);
-            return 0L;
+            return;
         }
 
         if (bDateNTimeCol)
@@ -626,12 +626,11 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop )
         OSL_FAIL("FmGridHeader::OnAsyncExecuteDrop: caught an exception while creatin' the column !");
         ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet);
         ::comphelper::disposeComponent(m_pImpl->xDroppedStatement);
-        return 0L;
+        return;
     }
 
     ::comphelper::disposeComponent(m_pImpl->xDroppedResultSet);
     ::comphelper::disposeComponent(m_pImpl->xDroppedStatement);
-    return 1L;
 }
 
 void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu)
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index b4d305da16d2..70ea9e9601cf 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2849,11 +2849,10 @@ void DbGridControl::Command(const CommandEvent& rEvt)
     }
 }
 
-IMPL_LINK_NOARG(DbGridControl, OnDelete)
+IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void)
 {
     m_nDeleteEvent = 0;
     DeleteSelectedRows();
-    return 0;
 }
 
 void DbGridControl::DeleteSelectedRows()
@@ -3461,7 +3460,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows)
     }
 }
 
-IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat)
+IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void)
 {
     m_nAsynAdjustEvent = 0;
 
@@ -3470,8 +3469,6 @@ IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat)
 
     if ( !pAdjustWhat )
         AdjustDataSource();
-
-    return 0L;
 }
 
 void DbGridControl::BeginCursorAction()
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 1063d0fc526e..0d12fdbd2dbf 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -37,10 +37,10 @@ namespace svxform
         m_nEventId = 0;
     }
 
-    IMPL_LINK( DelayedEvent, OnCall, void*, _pArg )
+    IMPL_LINK_TYPED( DelayedEvent, OnCall, void*, _pArg, void )
     {
         m_nEventId = 0;
-        return m_aHandler.Call( _pArg );
+        m_aHandler.Call( _pArg );
     }
 }
 
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 7a00bad224db..b9fcbb29e834 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1243,11 +1243,11 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN
 }
 
 
-IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry )
+IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void )
 {
+    SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p);
     // now remove the entry
     m_pModel->Remove(static_cast<FmFilterData*>(pEntry->GetUserData()));
-    return 0L;
 }
 
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 4b0b6691ac38..7085bc6c3788 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -485,11 +485,10 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 }
 
 
-IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus )
+IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, void )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();
-    return 0L;
 }
 
 
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 07cbcb0e36af..ff6121406c08 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -136,7 +136,7 @@ namespace svxform
         void    impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult );
 
     private:
-        DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
+        DECL_LINK_TYPED( OnAsyncScriptEvent, void*, void );
     };
 
     class FormScriptingEnvironment:
@@ -770,11 +770,12 @@ namespace svxform
     }
 
 
-    IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent )
+    IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void )
     {
+        ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p);
         OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" );
         if ( !_pEvent )
-            return 1L;
+            return;
 
         {
             ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -786,7 +787,6 @@ namespace svxform
         delete _pEvent;
         // we acquired ourself immediately before posting the event
         release();
-        return 0L;
     }
 
     FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 6866e3a28f80..7f56255a547f 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1003,10 +1003,10 @@ void FmXFormShell::LockSlotInvalidation(bool bLock)
 }
 
 
-IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
+IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void)
 {
     if ( impl_checkDisposed() )
-        return 0L;
+        return;
 
     ::osl::MutexGuard aGuard(m_aInvalidationSafety);
     m_nInvalidationEvent = 0;
@@ -1019,7 +1019,6 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
             m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
     }
     m_arrInvalidSlots.clear();
-    return 0L;
 }
 
 
@@ -3616,10 +3615,10 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate
 }
 
 
-IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation )
+IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void )
 {
     if ( impl_checkDisposed() )
-        return 0L;
+        return;
 
     m_nActivationEvent = 0;
     SfxObjectShell* pDocument = m_pShell->GetObjectShell();
@@ -3633,8 +3632,6 @@ IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation )
                 m_pShell->GetViewShell()->GetViewFrame()->ToggleChildWindow( SID_FM_SHOW_DATANAVIGATOR );
         }
     }
-
-    return 0L;
 }
 
 
@@ -3782,13 +3779,12 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels
 }
 
 
-IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ )
+IMPL_LINK_NOARG_TYPED( FmXFormShell, OnLoadForms, void*, void )
 {
     FmLoadAction aAction = m_aLoadingPages.front();
     m_aLoadingPages.pop();
 
     loadForms( aAction.pPage, aAction.nFlags & ~FORMS_ASYNC );
-    return 0L;
 }
 
 
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 7b90f621db4e..eba86b2b0eaf 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -606,11 +606,10 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
 }
 
 
-IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage)
+IMPL_LINK_NOARG_TYPED(FmXFormView, OnDelayedErrorMessage, void*, void)
 {
     m_nErrorMessageEvent = 0;
     displayException( m_aAsyncError );
-    return 0L;
 }
 
 
@@ -715,14 +714,14 @@ namespace
 }
 
 
-IMPL_LINK_NOARG(FmXFormView, OnActivate)
+IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void)
 {
     m_nActivationEvent = 0;
 
     if ( !m_pView )
     {
         OSL_FAIL( "FmXFormView::OnActivate: well .... seems we have a timing problem (the view already died)!" );
-        return 0;
+        return;
     }
 
     // setting the controller to activate
@@ -731,7 +730,7 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
         FmXFormShell* const pShImpl =  m_pView->GetFormShell()->GetImpl();
 
         if(!pShImpl)
-            return 0;
+            return;
 
         find_active_databaseform fad(pShImpl->getActiveController());
 
@@ -775,7 +774,6 @@ IMPL_LINK_NOARG(FmXFormView, OnActivate)
             pShImpl->setActiveController( xControllerToActivate );
         }
     }
-    return 0;
 }
 
 
@@ -955,16 +953,13 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF
 }
 
 
-IMPL_LINK_NOARG(FmXFormView, OnAutoFocus)
+IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void)
 {
     m_nAutoFocusEvent = 0;
 
     // go to the first form of our page, examine it's TabController, go to it's first (in terms of the tab order)
     // control, give it the focus
 
-    do
-    {
-
     SdrPageView *pPageView = m_pView ? m_pView->GetSdrPageView() : NULL;
     SdrPage *pSdrPage = pPageView ? pPageView->GetPage() : NULL;
     // get the forms collection of the page we belong to
@@ -974,13 +969,13 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus)
     const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0];
     const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL;
 
-    ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L );
+    ENSURE_OR_RETURN_VOID( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" );
 
     try
     {
         // go for the tab controller of the first form
         if ( !xForms->getCount() )
-            break;
+            return;
         Reference< XForm > xForm( xForms->getByIndex( 0 ), UNO_QUERY_THROW );
         Reference< XTabController > xTabController( pAdapter->getController( xForm ), UNO_QUERY_THROW );
 
@@ -1005,7 +1000,7 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus)
         // set the focus to this first control
         Reference< XWindow > xControlWindow( lcl_firstFocussableControl( aControls ), UNO_QUERY );
         if ( !xControlWindow.is() )
-            break;
+            return;
 
         xControlWindow->setFocus();
 
@@ -1023,11 +1018,6 @@ IMPL_LINK_NOARG(FmXFormView, OnAutoFocus)
     {
         DBG_UNHANDLED_EXCEPTION();
     }
-
-    }   // do
-    while ( false );
-
-    return 1L;
 }
 
 
@@ -1077,12 +1067,12 @@ void FmXFormView::breakCreateFormObject()
     m_xLastCreatedControlModel.clear();
 }
 
-IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard )
+IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void )
 {
     m_nControlWizardEvent = 0;
     OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" );
     if ( !m_xLastCreatedControlModel.is() )
-        return 0L;
+        return;
 
     sal_Int16 nClassId = FormComponentType::CONTROL;
     try
@@ -1146,7 +1136,6 @@ IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard )
     }
 
     m_xLastCreatedControlModel.clear();
-    return 1L;
 }
 
 
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 7eeb6e59c8e8..58ca669f076e 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1483,13 +1483,11 @@ namespace svxform
     }
 
 
-    IMPL_LINK_NOARG(NavigatorTree, OnEdit)
+    IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEdit, void*, void)
     {
         nEditEvent = 0;
         EditEntry( m_pEditEntry );
         m_pEditEntry = NULL;
-
-        return 0L;
     }
 
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 6e0a1a304b27..bf1e04d68bd0 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -339,12 +339,12 @@ IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, VclAbstractDialog2*, pDial
     return 0L;
 }
 
-IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, pDialog )
+IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void )
 {
+    VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p);
     delete pDialog;
     delete mpThemePropsDlgItemSet;
     mpThemePropsDlgItemSet = 0;
-    return 0L;
 }
 
 void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
@@ -581,7 +581,7 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
     return bRet;
 }
 
-IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
+IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void)
 {
     ::std::vector< sal_uInt16 > aExecVector;
     ImplGetExecuteVector(aExecVector);
@@ -606,8 +606,6 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
 
         aMenu.Execute( this, aSelPos );
     }
-
-    return 0L;
 }
 
 IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index cc8f2490f1f3..74a655206452 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -111,11 +111,11 @@ private:
 
                             DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void );
                             DECL_LINK( SelectThemeHdl, void* );
-                            DECL_LINK( ShowContextMenuHdl, void* );
+                            DECL_LINK_TYPED( ShowContextMenuHdl, void*, void );
                             DECL_LINK( PopupMenuHdl, Menu* );
                             DECL_LINK( EndNewThemePropertiesDlgHdl, VclAbstractDialog2* );
                             DECL_LINK( EndThemePropertiesDlgHdl, VclAbstractDialog2* );
-                            DECL_LINK( DestroyThemePropertiesDlgHdl, VclAbstractDialog2* );
+                            DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void );
 
 public:
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 13ba4de2997c..6f0d17364d10 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -73,8 +73,9 @@ struct DispatchInfo
     css::uno::Reference< css::frame::XDispatch >    Dispatch;
 };
 
-IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchInfo )
+IMPL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void )
 {
+    DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p);
     if ( pDispatchInfo && pDispatchInfo->Dispatch.is() )
     {
         try
@@ -88,7 +89,6 @@ IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, DispatchInfo*, pDispatchI
     }
 
     delete pDispatchInfo;
-    return 0;
 }
 
 namespace
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 2ccaca72b11c..8286cca9d831 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -66,7 +66,7 @@ namespace svxform
         ImplSVEvent * m_nEventId;
 
     private:
-        DECL_LINK( OnCall, void* );
+        DECL_LINK_TYPED( OnCall, void*, void );
 
     private:
         DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION;
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 16fbcba186dd..8e1bf2190c98 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -280,7 +280,7 @@ protected:
     void Insert(FmFilterData* pItem, sal_uLong nPos);
     void Remove(FmFilterData* pItem);
 
-    DECL_LINK(OnRemove, SvTreeListEntry*);
+    DECL_LINK_TYPED(OnRemove, void*, void);
     DECL_LINK_TYPED(OnDropActionTimer, Timer*, void);
 
 private:
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index fdd9d6726fd8..ff6b0213618f 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -67,7 +67,7 @@ protected:
     virtual void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE;
     virtual bool Close() SAL_OVERRIDE;
 
-    DECL_LINK( OnAsyncGetFocus, void* );
+    DECL_LINK_TYPED( OnAsyncGetFocus, void*, void );
 
     void implSetNewSelection( const InterfaceBag& _rSelection );
     void implDetachController();
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 604a5a49979e..12db53d0c2b1 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -473,7 +473,7 @@ namespace svxform
 
         static bool IsHiddenControl(FmEntryData* pEntryData);
 
-        DECL_LINK( OnEdit, void* );
+        DECL_LINK_TYPED( OnEdit, void*, void );
         DECL_LINK_TYPED( OnDropActionTimer, Timer*, void );
 
         DECL_LINK(OnEntrySelDesel, NavigatorTree*);
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 29575413ccfd..082633eef1a0 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -468,7 +468,7 @@ private:
     DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
     DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*);
     DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void);
-    DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*);
+    DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void);
     DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPage*);
 
     SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE);
@@ -480,7 +480,7 @@ private:
     // (asynchron) invalidiert
     SAL_DLLPRIVATE void    LockSlotInvalidation(bool bLock);
 
-    DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*);
+    DECL_DLLPRIVATE_LINK_TYPED(OnInvalidateSlots, void*, void);
 
     SAL_DLLPRIVATE void    CloseExternalFormViewer();
         // closes the task-local beamer displaying a grid view for a form
@@ -530,7 +530,7 @@ public:
     SAL_DLLPRIVATE bool    IsFormSlotEnabled( sal_Int32 _nSlot, ::com::sun::star::form::runtime::FeatureState* _pCompleteState = NULL );
 
 protected:
-    DECL_DLLPRIVATE_LINK( OnLoadForms, FmFormPage* );
+    DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void );
 };
 
 
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 6dd1c861ed01..a713c6e734d8 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -296,10 +296,10 @@ private:
 
     /// the auto focus to the first (in terms of the tab order) control
     void AutoFocus( bool _bSync = false );
-    DECL_LINK( OnActivate, void* );
-    DECL_LINK( OnAutoFocus, void* );
-    DECL_LINK( OnDelayedErrorMessage, void* );
-    DECL_LINK( OnStartControlWizard, void* );
+    DECL_LINK_TYPED( OnActivate, void*, void );
+    DECL_LINK_TYPED( OnAutoFocus, void*, void );
+    DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void );
+    DECL_LINK_TYPED( OnStartControlWizard, void*, void );
 
 private:
     ::svxform::DocumentType impl_getDocumentType() const;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 4a02a44058ae..8b4bd29c776a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2789,7 +2789,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
 
 
 
-IMPL_LINK_NOARG(SvxTableController, UpdateHdl)
+IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void)
 {
     mnUpdateEvent = 0;
 
@@ -2805,8 +2805,6 @@ IMPL_LINK_NOARG(SvxTableController, UpdateHdl)
         }
     }
     updateSelectionOverlay();
-
-    return 0;
 }
 
 namespace
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index dfced96d64db..7200055bb5b1 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -167,12 +167,11 @@ void SvxColorValueSet_docking::DoDrag()
     }
 }
 
-IMPL_LINK_NOARG(SvxColorValueSet_docking, ExecDragHdl)
+IMPL_LINK_NOARG_TYPED(SvxColorValueSet_docking, ExecDragHdl, void*, void)
 {
     // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die
     // Farbleiste geloescht werden darf
     DoDrag();
-    return 0;
 }
 
 SvxColorDockingWindow::SvxColorDockingWindow