Convert vcl Button Link<> click handler to typed Link<Button*,void>

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

44 files changed, 213 insertions, 282 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 89a4930942a8..e0e6866e18e1 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -115,7 +115,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
         AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding()));
 }
 
-IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void)
 {
     try
     {
@@ -131,8 +131,6 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
     }
 
     EndDialog(RET_OK);
-
-    return 0;
 }
 
 OUString CertPathDialog::getDirectory() const
@@ -217,7 +215,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath
     HandleCheckEntry(pEntry);
 }
 
-IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(CertPathDialog, AddHdl_Impl, Button*, void)
 {
     try
     {
@@ -240,8 +238,6 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
     {
         SAL_WARN("cui.options", "caught UNO exception: " << e.Message);
     }
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 5a09f9c153eb..510c1529efc2 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -27,8 +27,8 @@ private:
     OUString    m_sManual;
 
     DECL_LINK(CheckHdl_Impl, SvSimpleTable *);
-    DECL_LINK(AddHdl_Impl, void *);
-    DECL_LINK(OKHdl_Impl, void *);
+    DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
 
     void HandleCheckEntry(SvTreeListEntry* _pEntry);
     void AddCertPath(const OUString &rProfile, const OUString &rPath);
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b8253a6b1d21..21e5b51c776b 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -449,7 +449,7 @@ namespace offapp
     }
 
 
-    IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox )
+    IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void )
     {
         bool bGloballyEnabled = m_pEnablePooling->IsChecked();
         bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox;
@@ -474,8 +474,6 @@ namespace offapp
             m_pDriverList->getCurrentRow()->bEnabled = m_pDriverPoolingEnabled->IsChecked();
             m_pDriverList->updateCurrentRow();
         }
-
-        return 0L;
     }
 
 } // namespace offapp
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index d06ec8893afd..124a7971c9b4 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -59,7 +59,7 @@ namespace offapp
         virtual void        ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
 
     protected:
-        DECL_LINK( OnEnabledDisabled, const CheckBox* );
+        DECL_LINK_TYPED( OnEnabledDisabled, Button*, void );
         DECL_LINK( OnDriverRowChanged, const void* );
 
         void implInitControls(const SfxItemSet& _rSet, bool _bFromReset);
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 569032936e65..eedd4f4b440c 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -145,7 +145,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons
     Size aHeadSize = rBar.GetSizePixel();
 
     m_pPathBox->SetStyle( m_pPathBox->GetStyle()|nBits );
-    m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
+    m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, PathBoxDoubleClickHdl ) );
     m_pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage, PathSelect_Impl ) );
     m_pPathBox->SetSelectionMode( SINGLE_SELECTION );
     m_pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ),
@@ -273,7 +273,7 @@ void DbRegistrationOptionsPage::FillUserData()
     SetUserData( aUserData );
 }
 
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void)
 {
     SvTreeListEntry* pEntry = m_pPathBox->FirstSelected();
     if ( pEntry )
@@ -282,32 +282,35 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
         if ( aQuery->Execute() == RET_YES )
             m_pPathBox->GetModel()->Remove(pEntry);
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl)
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void)
 {
     OUString sNewName,sNewLocation;
     openLinkDialog(sNewName,sNewLocation);
+}
+
+IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl)
+{
+    EditHdl(NULL);
     return 0;
 }
 
-IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
+
+IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void)
 {
     SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry();
     if ( !pEntry )
-        return 0L;
+        return;
 
     DatabaseRegistration* pOldRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() );
     if ( !pOldRegistration || pOldRegistration->bReadOnly )
-        return 0L;
+        return;
 
     OUString sOldName = SvTabListBox::GetEntryText(pEntry,0);
     m_pCurEntry = pEntry;
     openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry );
     m_pCurEntry = NULL;
-
-    return 1L;
 }
 
 
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index f5f24b741380..304a74ad285e 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -103,7 +103,7 @@ namespace svx
     }
 
 
-    IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk)
+    IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnOk, Button*, void)
     {
         // get the current URL
         OUString sURL = m_pURL->GetText();
@@ -128,7 +128,7 @@ namespace svx
             sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
             ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
             aError->Execute();
-            return 0L;
+            return;
         } // if (!bFileExists)
         INetURLObject aURL( sURL );
         if ( aURL.GetProtocol() != INetProtocol::File )
@@ -137,7 +137,7 @@ namespace svx
             sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
             ScopedVclPtrInstance< MessageDialog > aError(this, sMsg);
             aError->Execute();
-            return 0L;
+            return;
         }
 
         OUString sCurrentText = m_pName->GetText();
@@ -152,16 +152,15 @@ namespace svx
 
                 m_pName->SetSelection(Selection(0,sCurrentText.getLength()));
                 m_pName->GrabFocus();
-                return 0L;
+                return;
             }
         }
 
         EndDialog(RET_OK);
-        return 0L;
     }
 
 
-    IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile)
+    IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void)
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
@@ -180,7 +179,7 @@ namespace svx
         }
 
         if (0 != aFileDlg.Execute())
-            return 0L;
+            return;
 
         if (m_pName->GetText().isEmpty())
         {   // default the name to the base of the chosen URL
@@ -202,7 +201,6 @@ namespace svx
         m_pURL->SetText(aTransformer.get(OFileNotation::N_SYSTEM));
 
         validate();
-        return 0L;
     }
 
 
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index 376d6f04d0e7..a9c935c3a085 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -60,8 +60,8 @@ namespace svx
 
     protected:
         DECL_LINK(OnTextModified, void *);
-        DECL_LINK( OnBrowseFile, void* );
-        DECL_LINK( OnOk, void* );
+        DECL_LINK_TYPED( OnBrowseFile, Button*, void );
+        DECL_LINK_TYPED( OnOk, Button*, void );
 
         void validate( );
     };
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 848625204ca8..3d5c9f978c3d 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -89,15 +89,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
 
     aTextColor = m_pCheckLB->GetTextColor();
     Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+    Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
 
     m_pCheckLB->SetSelectHdl(aLink);
-    m_pUseTableCB->SetClickHdl(aLink);
+    m_pUseTableCB->SetClickHdl(aClickLink);
     m_pFont1CB->SetSelectHdl(aLink);
     m_pFont1CB->SetModifyHdl(aLink);
     m_pFont2CB->SetSelectHdl(aLink);
     m_pFont2CB->SetModifyHdl(aLink);
-    m_pApply->SetClickHdl(aLink);
-    m_pDelete->SetClickHdl(aLink);
+    m_pApply->SetClickHdl(aClickLink);
+    m_pDelete->SetClickHdl(aClickLink);
 
     m_pNonPropFontsOnlyCB->SetClickHdl(LINK(this, SvxFontSubstTabPage, NonPropFontsHdl));
 
@@ -256,6 +257,11 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
     m_pFontHeightLB->SaveValue();
 }
 
+IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void)
+{
+    SelectHdl(pButton);
+}
+
 IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 {
     if (pWin == m_pApply || pWin == m_pDelete)
@@ -333,10 +339,10 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 }
 
 
-IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void)
 {
     OUString sFontName = m_pFontNameLB->GetSelectEntry();
-    bool bNonPropOnly = pBox->IsChecked();
+    bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked();
     m_pFontNameLB->Clear();
     FontList aFntLst( Application::GetDefaultDevice() );
     m_pFontNameLB->InsertEntry(m_sAutomatic);
@@ -348,7 +354,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
             m_pFontNameLB->InsertEntry(rInfo.GetName());
     }
     m_pFontNameLB->SelectEntry(sFontName);
-    return 0;
 }
 
 void SvxFontSubstTabPage::CheckEnable()
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 5a47c784d791..f82330bba6d5 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -82,7 +82,8 @@ class SvxFontSubstTabPage : public SfxTabPage
     SvLBoxButtonData*   pCheckButtonData;
 
     DECL_LINK(SelectHdl, vcl::Window *);
-    DECL_LINK(NonPropFontsHdl, CheckBox* );
+    DECL_LINK_TYPED(ClickHdl, Button*, void);
+    DECL_LINK_TYPED(NonPropFontsHdl, Button*, void);
 
     SvTreeListEntry*    CreateEntry(OUString& rFont1, OUString& rFont2);
     void            CheckEnable();
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 7b18d07adc2a..c4676a1446b9 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -155,7 +155,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI
 
     m_pEditBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, StandardHdl_Impl ) );
     m_pResetBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, ResetBtnHdl_Impl ) );
-    m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, StandardHdl_Impl) );
+    m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, DoubleClickHdl_Impl) );
     m_pPrefBox->SetExpandingHdl( LINK(this, CuiAboutConfigTabPage, ExpandingHdl_Impl) );
     m_pSearchBtn->SetClickHdl( LINK(this, CuiAboutConfigTabPage, SearchHdl_Impl) );
 
@@ -570,17 +570,22 @@ void CuiAboutConfigValueDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl )
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void )
 {
     Reset();
+}
+
+IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl )
+{
+    StandardHdl_Impl(NULL);
     return 0;
 }
 
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void )
 {
     SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry();
     if(pEntry == nullptr)
-        return 0;
+        return;
 
     UserData *pUserData = static_cast<UserData*>(pEntry->GetUserData());
     if(pUserData && pUserData->bIsPropertyPath)
@@ -812,10 +817,9 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
         {
         }
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl)
+IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void)
 {
     m_pPrefBox->Clear();
     m_pPrefBox->SetUpdateMode( false );
@@ -863,8 +867,6 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl)
         m_pPrefBox->SortByCol(sortedCol, sortMode == SortAscending);
 
     m_pPrefBox->SetUpdateMode( true );
-
-    return 0;
 }
 
 void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry)
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 0938dc86d0ce..35fdd5559c41 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -61,9 +61,10 @@ private:
     static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
     void InsertEntry( SvTreeListEntry *pEntry);
 
-    DECL_LINK( StandardHdl_Impl, void * );
-    DECL_LINK( ResetBtnHdl_Impl, void * );
-    DECL_LINK( SearchHdl_Impl, void* );
+    DECL_LINK_TYPED( StandardHdl_Impl, Button*, void );
+    DECL_LINK( DoubleClickHdl_Impl, void* );
+    DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void );
+    DECL_LINK_TYPED( SearchHdl_Impl, Button*, void );
     DECL_LINK( ExpandingHdl_Impl, void* );
 
 public:
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 31d4b4308659..9f2ac0421969 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -378,16 +378,15 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl)
     return 0;
 }
 
-IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void)
 {
-    bool bCheck = pBox->IsChecked();
+    bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked();
     m_pStartED->Enable(!bCheck);
     m_pEndED->Enable(!bCheck);
     m_pStartFT->Enable(!bCheck);
     m_pEndFT->Enable(!bCheck);
 
     ModifyHdl(m_pStartED);
-    return 0;
 }
 
 IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index f9e3c0e22d40..04193d1d5b53 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -180,7 +180,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
 // ResetToDefaults
 
 
-IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
+IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void)
 {
     if( pColorConfig )
     {
@@ -192,14 +192,12 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
         m_pLbChartColors->SelectEntryPos( 0 );
         m_pPBRemove->Enable( true );
     }
-
-    return 0L;
 }
 
 // AddChartColor
 
 
-IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
+IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void)
 {
     if( pColorConfig )
     {
@@ -213,19 +211,17 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
         m_pLbChartColors->SelectEntryPos( pColorConfig->GetColorList().size() - 1 );
         m_pPBRemove->Enable( true );
     }
-
-    return 0L;
 }
 
 // RemoveChartColor
 
 
-IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
+IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void )
 {
     sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos();
 
     if (m_pLbChartColors->GetSelectEntryCount() == 0)
-        return 0L;
+        return;
 
     if( pColorConfig )
     {
@@ -249,8 +245,6 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
                 m_pPBRemove->Enable(true);
         }
     }
-
-    return 0L;
 }
 
 IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 506b9c87f1a0..17f6af34a627 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -43,9 +43,9 @@ private:
     SvxChartColorTableItem* pColorConfig;
     XColorListRef           pColorList;
 
-    DECL_LINK( ResetToDefaults, void * );
-    DECL_LINK( AddChartColor, void * );
-    DECL_LINK( RemoveChartColor, PushButton * );
+    DECL_LINK_TYPED( ResetToDefaults, Button *, void );
+    DECL_LINK_TYPED( AddChartColor, Button *, void );
+    DECL_LINK_TYPED( RemoveChartColor, Button *, void );
     DECL_LINK( ListClickedHdl, ColorLB * );
     DECL_LINK(BoxClickedHdl, void *);
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 999aeecdea2b..1f90dcf72efc 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -179,7 +179,7 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
 public:
-    void SetLinks (Link<> const&, Link<> const&, Link<> const&);
+    void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&);
     unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); }
     void Update (EditableColorConfig const*, EditableExtendedColorConfig const*);
     void ScrollHdl(const ScrollBar&);
@@ -221,7 +221,7 @@ private:
         void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList);
         void SetTextColor (Color C) { m_pText->SetTextColor(C); }
     public:
-        void SetLinks (Link<> const&, Link<> const&, Link<> const&);
+        void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&);
         void Update (ColorConfigEntry, ColorConfigValue const&);
         void Update (ExtendedColorConfigValue const&);
         void ColorChanged (ColorConfigEntry, ColorConfigValue&);
@@ -416,7 +416,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(
 
 // SetLinks()
 void ColorConfigWindow_Impl::Entry::SetLinks(
-    Link<> const& aCheckLink, Link<> const& aColorLink,
+    Link<Button*,void> const& aCheckLink, Link<> const& aColorLink,
     Link<> const& aGetFocusLink)
 {
     m_pColorList->SetSelectHdl(aColorLink);
@@ -691,7 +691,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB)
 
 // SetLinks()
 void ColorConfigWindow_Impl::SetLinks (
-    Link<> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
+    Link<Button*,void> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
 ) {
     for (unsigned i = 0; i != vEntries.size(); ++i)
         vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -847,7 +847,7 @@ class ColorConfigCtrl_Impl : public VclVBox
     EditableExtendedColorConfig*    pExtColorConfig;
 
     DECL_LINK(ScrollHdl, ScrollBar*);
-    DECL_LINK(ClickHdl, CheckBox*);
+    DECL_LINK_TYPED(ClickHdl, Button*, void);
     DECL_LINK(ColorHdl, ColorListBox*);
     DECL_LINK(ControlFocusHdl, Control*);
 
@@ -901,7 +901,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
     m_pVScroll->SetScrollHdl(aScrollLink);
     m_pVScroll->SetEndScrollHdl(aScrollLink);
 
-    Link<> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
+    Link<Button*,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
     Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
     Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
     m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -1002,11 +1002,10 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox)
+IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void)
 {
     DBG_ASSERT(pColorConfig, "Configuration not set");
-    m_pScrollWindow->ClickHdl(pColorConfig, pBox);
-    return 0;
+    m_pScrollWindow->ClickHdl(pColorConfig, static_cast<CheckBox*>(pBox));
 }
 
 // a color list has changed
@@ -1071,7 +1070,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
         get<vcl::Window>("preview")->GetText());
 
     m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
-    Link<> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
+    Link<Button*,void> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
     m_pSaveSchemePB->SetClickHdl(aLk);
     m_pDeleteSchemePB->SetClickHdl(aLk);
 }
@@ -1188,7 +1187,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox)
     return 0;
 }
 
-IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
+IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
 {
     if (m_pSaveSchemePB == pButton)
     {
@@ -1230,7 +1229,6 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
         }
     }
     m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 );
-    return 0;
 }
 
 IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index c16c2973ee0f..ca290410d458 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -42,7 +42,7 @@ class SvxColorOptionsTabPage : public SfxTabPage
     svtools::EditableExtendedColorConfig* pExtColorConfig;
 
     DECL_LINK(SchemeChangedHdl_Impl, ListBox*);
-    DECL_LINK(SaveDeleteHdl_Impl, PushButton*);
+    DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void);
     DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog*);
     void UpdateColorConfig();
 
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 4cc080630f75..5b8911db6fa3 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -24,7 +24,7 @@
 
 // class SvxCTLOptionsPage -----------------------------------------------------
 
-IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
+IMPL_LINK_NOARG_TYPED(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void)
 {
     bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked();
     m_pRestrictedCB->Enable( bIsSequenceChecking );
@@ -35,7 +35,6 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
         m_pTypeReplaceCB->Check();
         m_pRestrictedCB->Check();
     }
-    return 0;
 }
 
 SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) :
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index ac2544d47c27..3cffb33e08e6 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -39,7 +39,7 @@ private:
 
     VclPtr<ListBox>             m_pNumeralsLB;
 
-    DECL_LINK( SequenceCheckingCB_Hdl, void* );
+    DECL_LINK_TYPED( SequenceCheckingCB_Hdl, Button*, void );
 
 public:
     SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 7026e5f3664f..9b3e949a6fa2 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -133,7 +133,7 @@ void SvxNewDictionaryDialog::dispose()
 }
 
 
-IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void)
 {
     OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' ');
     // add extension for personal dictionaries
@@ -158,7 +158,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
         // duplicate names?
         ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VCL_MESSAGE_INFO)->Execute();
         pNameEdit->GrabFocus();
-        return 0;
+        return;
     }
 
     // create and add
@@ -202,7 +202,6 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
 
 
     EndDialog( RET_OK );
-    return 0;
 }
 
 
@@ -273,8 +272,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
     pWordED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl));
     pReplaceED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl));
-    pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
-    pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
+    pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl));
+    pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl));
 
     // fill listbox with all available WB's
     const Reference< XDictionary >  *pDic = aDics.getConstArray();
@@ -593,7 +592,12 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
 
 
 
-IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
+IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelHdl, Button*, pBtn, void)
+{
+    NewDelActionHdl(static_cast<PushButton*>(pBtn));
+}
+
+IMPL_LINK(SvxEditDictionaryDialog, NewDelActionHdl, PushButton*, pBtn)
 {
     SvTreeListEntry* pEntry = pWordsLB->FirstSelected();
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index af543b331743..4f35b27cf43d 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -73,16 +73,14 @@ void OfaMSFilterTabPage::dispose()
 }
 
 
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void)
 {
     aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
-    return 0;
 }
 
-IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void)
 {
     aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
-    return 0;
 }
 
 VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent,
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 2abda52cb46e..d9535fb5dbf0 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -37,8 +37,8 @@ class OfaMSFilterTabPage : public SfxTabPage
     VclPtr<CheckBox>       aPBasicStgCB;
 
 
-    DECL_LINK(LoadWordBasicCheckHdl_Impl, void *);
-    DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *);
+    DECL_LINK_TYPED(LoadWordBasicCheckHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(LoadExcelBasicCheckHdl_Impl, Button*, void);
 public:
     OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4970b4b4fda5..02926c82368c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1140,7 +1140,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
     m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) );
     m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) );
 
-    Link<> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
+    Link<Button*,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
     m_pAsianSupportCB->SetClickHdl( aLink );
     m_pCTLSupportCB->SetClickHdl( aLink );
 
@@ -1615,10 +1615,10 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
     }
 }
 
-IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
+IMPL_LINK_TYPED(  OfaLanguagesTabPage, SupportHdl, Button*, pButton, void )
 {
+    CheckBox* pBox = static_cast<CheckBox*>(pButton);
     DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-
     bool bCheck = pBox->IsChecked();
     if ( m_pAsianSupportCB == pBox )
     {
@@ -1638,8 +1638,6 @@ IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
     }
     else
         SAL_WARN( "cui.options", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" );
-
-    return 0;
 }
 
 namespace
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 013f28d4ac7e..b031e7918bbb 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -160,7 +160,7 @@ class OfaLanguagesTabPage : public SfxTabPage
 
     bool            m_bDatePatternsValid;
 
-    DECL_LINK(  SupportHdl, CheckBox* ) ;
+    DECL_LINK_TYPED(  SupportHdl, Button*, void ) ;
     DECL_LINK(  LocaleSettingHdl, SvxLanguageBox* ) ;
     DECL_LINK(  DatePatternsHdl, Edit* ) ;
 
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 537018c5ef4f..a54e17f63871 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -182,10 +182,9 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* )
         aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() );
 }
 
-IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox)
+IMPL_LINK_TYPED(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void)
 {
-    aStarBasicWarningCB->Enable(!pBox->IsChecked());
-    return 0;
+    aStarBasicWarningCB->Enable(!static_cast<CheckBox*>(pBox)->IsChecked());
 }
 
 
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index c8a0bd999343..3fce3de5273a 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -47,7 +47,7 @@ class OfaHtmlTabPage : public SfxTabPage
     VclPtr<CheckBox>        aSaveGrfLocalCB;
     VclPtr<SvxTextEncodingBox> aCharSetLB;
 
-    DECL_LINK(CheckBoxHdl_Impl, CheckBox*);
+    DECL_LINK_TYPED(CheckBoxHdl_Impl, Button*, void);
 
 public:
     virtual ~OfaHtmlTabPage();
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 67d5fed7124c..4891a4550e73 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -666,15 +666,14 @@ void SvxSecurityTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void)
 {
     if ( !mpSecOptDlg )
         mpSecOptDlg = VclPtr<svx::SecurityOptionsDialog>::Create( this, mpSecOptions );
     mpSecOptDlg->Execute();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void)
 {
     try
     {
@@ -725,11 +724,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl)
     {
         m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
     }
-
-    return 0;
 }
 
-IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
+IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void)
 {
     try
     {
@@ -741,11 +738,9 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl)
     }
     catch (const Exception&)
     {}
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void)
 {
     try
     {
@@ -785,11 +780,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl)
     {
         m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() );
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void)
 {
     try
     {
@@ -804,10 +797,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl)
     }
     catch (const Exception&)
     {}
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
 {
     if (!mpCertPathDlg)
         mpCertPathDlg = VclPtr<CertPathDialog>::Create(this);
@@ -820,11 +812,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl)
         ScopedVclPtrInstance< MessageDialog > aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
         aWarnBox->Execute();
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
+IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void)
 {
     // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between
     // invocations. Seems clearer to my little brain that way.
@@ -832,11 +822,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
     ScopedVclPtrInstance<TSAURLsDialog> pTSAURLsDlg(this);
 
     pTSAURLsDlg->Execute();
-
-    return 0;
 }
 
-IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
+IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void)
 {
     try
     {
@@ -849,7 +837,6 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl)
         OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
         (void)e;
     }
-    return 0;
 }
 
 
@@ -1076,7 +1063,7 @@ void SvxEMailTabPage::Reset( const SfxItemSet* )
 
 /* -------------------------------------------------------------------------*/
 
-IMPL_LINK(  SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
+IMPL_LINK_TYPED(  SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void )
 {
     if (m_pMailerURLPB == pButton && !pImpl->bROProgram)
     {
@@ -1103,7 +1090,6 @@ IMPL_LINK(  SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
             m_pMailerURLED->SetText(sPath);
         }
     }
-    return 0;
 }
 
 
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index c23dc7be8c87..0c5da70c3cee 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -155,14 +155,14 @@ private:
 
     OUString            m_sPasswordStoringDeactivateStr;
 
-    DECL_LINK(SecurityOptionsHdl, void *);
-    DECL_LINK(SavePasswordHdl, void* );
-    DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, void *);
-    DECL_LINK(MasterPasswordCBHdl, void* );
-    DECL_LINK(ShowPasswordsHdl, void *);
-    DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, void* );
-    DECL_LINK(CertPathPBHdl, void* );
-    DECL_LINK(TSAURLsPBHdl, void* );
+    DECL_LINK_TYPED(SecurityOptionsHdl, Button*, void);
+    DECL_LINK_TYPED(SavePasswordHdl, Button*, void);
+    DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void);
+    DECL_LINK_TYPED(MasterPasswordCBHdl, Button*, void);
+    DECL_LINK_TYPED(ShowPasswordsHdl, Button*, void);
+    DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void );
+    DECL_LINK_TYPED(CertPathPBHdl, Button*, void );
+    DECL_LINK_TYPED(TSAURLsPBHdl, Button*, void );
 
     void                InitControls();
 
@@ -195,7 +195,7 @@ class SvxEMailTabPage : public SfxTabPage
 
     SvxEMailTabPage_Impl* pImpl;
 
-    DECL_LINK(  FileDialogHdl_Impl, PushButton* ) ;
+    DECL_LINK_TYPED(  FileDialogHdl_Impl, Button*, void );
 
 public:
     SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 6da45086e863..ee9afe036efa 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -236,12 +236,11 @@ void SvxJavaOptionsPage::dispose()
 
 
 
-IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void)
 {
     bool bEnable = m_pJavaEnableCB->IsChecked();
     m_pJavaBox->Enable(bEnable);
     bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable();
-    return 0;
 }
 
 
@@ -273,7 +272,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
 
 
 
-IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void)
 {
     try
     {
@@ -294,13 +293,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
     {
         SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception: " << e.Message);
     }
-
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void)
 {
 #if HAVE_FEATURE_JAVA
     Sequence< OUString > aParameterList;
@@ -344,12 +341,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
     else
         m_pParamDlg->SetParameters( aParameterList );
 #endif
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void)
 {
 #if HAVE_FEATURE_JAVA
     OUString sClassPath;
@@ -389,7 +385,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
     else
         m_pPathDlg->SetClassPath( sClassPath );
 #endif
-    return 0;
 }
 
 
@@ -433,7 +428,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt,
 
 
 
-IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
+IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void )
 {
     ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this);
     m_pExpertConfigDlg->Reset();//initialize and reset function
@@ -444,7 +439,6 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
     }
 
     m_pExpertConfigDlg.disposeAndClear();
-    return 0;
 }
 
 
@@ -844,7 +838,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
 
 
 
-IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void)
 {
     OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' ');
     if (!sParam.isEmpty())
@@ -857,8 +851,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
         ModifyHdl_Impl( m_pParameterEdit );
         EnableRemoveButton();
     }
-
-    return 0;
 }
 
 
@@ -881,7 +873,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
 
 
 
-IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void)
 {
     sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -896,8 +888,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
         }
     }
     EnableRemoveButton();
-
-    return 0;
 }
 
 
@@ -979,7 +969,7 @@ void SvxJavaClassPathDlg::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
 {
     sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
@@ -1011,12 +1001,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
         }
     }
     EnableRemoveButton();
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
 {
     Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);;
@@ -1048,12 +1037,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
         }
     }
     EnableRemoveButton();
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void)
 {
     sal_Int32 nPos = m_pPathList->GetSelectEntryPos();
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1069,7 +1057,6 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
     }
 
     EnableRemoveButton();
-    return 0;
 }
 
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 06bd595bb81b..70acc0e922c9 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -84,18 +84,18 @@ private:
     css::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
     css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker;
 
-    DECL_LINK(EnableHdl_Impl, void *);
+    DECL_LINK_TYPED(EnableHdl_Impl, Button*, void);
     DECL_LINK(              CheckHdl_Impl, SvSimpleTable * );
     DECL_LINK(SelectHdl_Impl, void *);
-    DECL_LINK(AddHdl_Impl, void *);
-    DECL_LINK(ParameterHdl_Impl, void *);
-    DECL_LINK(ClassPathHdl_Impl, void *);
+    DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(ParameterHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(ClassPathHdl_Impl, Button*, void);
     DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void);
 
     DECL_LINK(              StartFolderPickerHdl, void * );
     DECL_LINK_TYPED(        DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
 
-    DECL_LINK(ExpertConfigHdl_Impl, void *);
+    DECL_LINK_TYPED(ExpertConfigHdl_Impl, Button*, void);
 
     void                    ClearJavaInfo();
     void                    ClearJavaList();
@@ -128,10 +128,10 @@ private:
     VclPtr<PushButton>             m_pRemoveBtn;
 
     DECL_LINK(ModifyHdl_Impl, void *);
-    DECL_LINK(AssignHdl_Impl, void *);
+    DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
     DECL_LINK(SelectHdl_Impl, void *);
     DECL_LINK(DblClickHdl_Impl, void *);
-    DECL_LINK(RemoveHdl_Impl, void *);
+    DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
 
     inline void             EnableRemoveButton()
                                 { m_pRemoveBtn->Enable(
@@ -162,9 +162,9 @@ private:
 
     OUString                m_sOldPath;
 
-    DECL_LINK(AddArchiveHdl_Impl, void *);
-    DECL_LINK(AddPathHdl_Impl, void *);
-    DECL_LINK(RemoveHdl_Impl, void *);
+    DECL_LINK_TYPED(AddArchiveHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(AddPathHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
     DECL_LINK(SelectHdl_Impl, void *);
 
     bool                    IsPathDuplicate( const OUString& _rPath );
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5a6817984955..f404fa28fa4c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1582,7 +1582,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
 
 
 
-IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
+IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
 {
     if (m_pLinguModulesEditPB == pBtn)
     {
@@ -1670,7 +1670,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
         ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDeleteDictionaryDialog",
                                                    "cui/ui/querydeletedictionarydialog.ui");
         if (RET_NO == aQuery->Execute())
-            return 0;
+            return;
 
         SvTreeListEntry *pEntry = m_pLinguDicsCLB->GetCurEntry();
         if (pEntry)
@@ -1758,8 +1758,6 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
     {
         OSL_FAIL( "pBtn unexpected value" );
     }
-
-    return 0;
 }
 
 
@@ -2274,7 +2272,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     return 0;
 }
 
-IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
+IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void )
 {
     bool bUp = m_pPrioUpPB == pBtn;
     sal_uLong  nCurPos = m_pModulesCLB->GetSelectEntryPos();
@@ -2300,22 +2298,19 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
         SelectHdl_Impl(m_pModulesCLB);
         m_pModulesCLB->SetUpdateMode(true);
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxEditModulesDlg, ClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void)
 {
     // store language config
     LangSelectHdl_Impl(m_pLanguageLB);
     EndDialog( RET_OK );
-    return 0;
 }
 
-IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void)
 {
     rLinguData = *pDefaultLinguData;
     LangSelectHdl_Impl(0);
-    return 0;
 }
 
 
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 4c97609dcbc4..e20876b9ede0 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -372,41 +372,40 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable)
     pFrame->Enable(aEnable);
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListEditHdl, Button*, void)
 {
-    return EditHdl(mpBlackList, maConfig.maBlackList, "bledit");
+    EditHdl(mpBlackList, maConfig.maBlackList, "bledit");
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListAddHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListAddHdl, Button*, void)
 {
-    return AddHdl(mpBlackList, maConfig.maBlackList, "bladd");
+    AddHdl(mpBlackList, maConfig.maBlackList, "bladd");
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListDeleteHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListDeleteHdl, Button*, void)
 {
-    return DeleteHdl(mpBlackList, maConfig.maBlackList);
+    DeleteHdl(mpBlackList, maConfig.maBlackList);
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListEditHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListEditHdl, Button*, void)
 {
-    return EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit");
+    EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit");
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListAddHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListAddHdl, Button*, void)
 {
-    return AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd");
+    AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd");
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListDeleteHdl, Button*, void)
 {
-    return DeleteHdl(mpWhiteList, maConfig.maWhiteList);
+    DeleteHdl(mpWhiteList, maConfig.maWhiteList);
 }
 
-IMPL_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl)
+IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void)
 {
     EnableOpenCLHdl(mpBlackListFrame, mpUseOpenCL->IsChecked());
     EnableOpenCLHdl(mpWhiteListFrame, mpUseOpenCL->IsChecked());
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 99886acbe038..1c57826bfa43 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -52,15 +52,15 @@ private:
     VclPtr<PushButton> mpWhiteListAdd;
     VclPtr<PushButton> mpWhiteListDelete;
 
-    DECL_LINK(BlackListEditHdl, void*);
-    DECL_LINK(BlackListAddHdl, void*);
-    DECL_LINK(BlackListDeleteHdl, void*);
+    DECL_LINK_TYPED(BlackListEditHdl, Button*, void);
+    DECL_LINK_TYPED(BlackListAddHdl, Button*, void);
+    DECL_LINK_TYPED(BlackListDeleteHdl, Button*, void);
 
-    DECL_LINK(WhiteListEditHdl, void*);
-    DECL_LINK(WhiteListAddHdl, void*);
-    DECL_LINK(WhiteListDeleteHdl, void*);
+    DECL_LINK_TYPED(WhiteListEditHdl, Button*, void);
+    DECL_LINK_TYPED(WhiteListAddHdl, Button*, void);
+    DECL_LINK_TYPED(WhiteListDeleteHdl, Button*, void);
 
-    DECL_LINK(EnableOpenCLHdl, void*);
+    DECL_LINK_TYPED(EnableOpenCLHdl, Button*, void);
 
     long EditHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
     long AddHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 6b985e73c876..787b9564160d 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -195,8 +195,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pPathCtrl, "paths");
 
     m_pStandardBtn->SetClickHdl(LINK(this, SvxPathTabPage, StandardHdl_Impl));
-    Link<> aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
-    m_pPathBtn->SetClickHdl( aLink );
+    m_pPathBtn->SetClickHdl( LINK( this, SvxPathTabPage, PathHdl_Impl ) );
 
     Size aControlSize(236 , 147);
     aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
@@ -224,7 +223,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     aTabs[3] = aTabs[2] + nWidth2 + 12;
     pPathBox->SetTabs(aTabs, MAP_PIXEL);
 
-    pPathBox->SetDoubleClickHdl( aLink );
+    pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, DoubleClickPathHdl_Impl ) );
     pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) );
     pPathBox->SetSelectionMode( MULTIPLE_SELECTION );
     pPathBox->SetHighlightRange();
@@ -405,7 +404,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
 
 
 
-IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void)
 {
     SvTreeListEntry* pEntry = pPathBox->FirstSelected();
     while ( pEntry )
@@ -456,7 +455,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
         }
         pEntry = pPathBox->NextSelected( pEntry );
     }
-    return 0;
 }
 
 
@@ -526,7 +524,13 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
 
 
 
-IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
+IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl)
+{
+    PathHdl_Impl(NULL);
+    return 0;
+}
+
+IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
 {
     SvTreeListEntry* pEntry = pPathBox->GetCurEntry();
     sal_uInt16 nPos = ( pEntry != NULL ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0;
@@ -541,7 +545,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
     }
 
     if(pEntry && !(!SvTreeListBox::GetCollapsedEntryBmp(pEntry)))
-        return 0;
+        return;
 
     if ( IsMultiPath_Impl( nPos ) )
     {
@@ -615,7 +619,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
             {
                 short nRet = xFolderPicker->execute();
                 if ( ExecutableDialogResults::OK != nRet )
-                    return 0;
+                    return;
 
                 OUString sFolder( xFolderPicker->getDirectory() );
                 ChangeCurrentEntry( sFolder );
@@ -626,7 +630,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
             SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" );
         }
     }
-    return 0;
 }
 
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 8bb88384c6c6..1ec65657ccd0 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -118,8 +118,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
     aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW)         );
     aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH)         );
 
-    Link<> aLink = LINK( this, SvxSaveTabPage, AutoClickHdl_Impl );
-    aAutoSaveCB->SetClickHdl( aLink );
+    aAutoSaveCB->SetClickHdl( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) );
     aAutoSaveEdit->SetMaxTextLen( 2 );
 
     SvtModuleOptions aModuleOpt;
@@ -186,7 +185,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
         pImpl->aDefaultReadonlyArr[APP_WRITER_GLOBAL] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::WRITERGLOBAL);
     }
 
-    aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
+    Link<> aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl );
     aODFVersionLB->SetSelectHdl( aLink );
     aLink = LINK( this, SvxSaveTabPage, FilterHdl_Impl );
     aDocTypeLB->SetSelectHdl( aLink );
@@ -515,7 +514,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 
 
 
-IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void )
 {
     if ( pBox == aAutoSaveCB )
     {
@@ -532,7 +531,6 @@ IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
             aUserAutoSaveCB->Disable();
         }
     }
-    return 0;
 }
 
 static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties)
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 98ec868a1b88..0a33a2a36239 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -60,7 +60,7 @@ private:
 
     SvxSaveTabPage_Impl*    pImpl;
 
-    DECL_LINK( AutoClickHdl_Impl, CheckBox * );
+    DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void );
     DECL_LINK( FilterHdl_Impl, ListBox * );
     DECL_LINK(ODFVersionHdl_Impl, void *);
 
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 5dee38d29b04..741a2ecca292 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -277,20 +277,18 @@ void SvxOnlineUpdateTabPage::FillUserData()
 
 
 
-IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
+IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void )
 {
-    bool bEnabled = pBox->IsChecked();
+    bool bEnabled = static_cast<CheckBox*>(pBox)->IsChecked();
 
     m_pEveryDayButton->Enable(bEnabled);
     m_pEveryWeekButton->Enable(bEnabled);
     m_pEveryMonthButton->Enable(bEnabled);
-
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void)
 {
     uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     uno::Reference < ui::dialogs::XFolderPicker2 >  xFolderPicker = ui::dialogs::FolderPicker::create(xContext);
@@ -308,13 +306,11 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
         if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder))
             m_pDestPath->SetText( aFolder );
     }
-
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void)
 {
     uno::Reference < uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() );
 
@@ -361,8 +357,6 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
          OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
             OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
     }
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index efafee9a6dc5..aaba652011fe 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -42,9 +42,9 @@ private:
     OUString       m_aNeverChecked;
     OUString       m_aLastCheckedTemplate;
 
-    DECL_LINK(FileDialogHdl_Impl, void *) ;
-    DECL_LINK(CheckNowHdl_Impl, void *) ;
-    DECL_LINK(  AutoCheckHdl_Impl, CheckBox* ) ;
+    DECL_LINK_TYPED(FileDialogHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(CheckNowHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(AutoCheckHdl_Impl, Button*, void);
 
     css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess;
 
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 8c0c5941026a..2450e1ab9484 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -119,7 +119,7 @@ OUString SelectPersonaDialog::GetSelectedPersona() const
     return OUString();
 }
 
-IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
+IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
 {
     OUString searchTerm;
     if( m_rSearchThread.is() )
@@ -140,7 +140,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
     }
 
     if( searchTerm.isEmpty( ) )
-        return 0;
+        return;
 
     // TODO FIXME!
     // Before the release, the allizom.org url should be changed to:
@@ -176,10 +176,9 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton )
     OUString rSearchURL = "https://addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/9";
     m_rSearchThread = new SearchAndParseThread( this, rSearchURL );
     m_rSearchThread->launch();
-    return 0;
 }
 
-IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ )
+IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void )
 {
     OUString aSelectedPersona = GetSelectedPersona();
 
@@ -195,19 +194,17 @@ IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ )
             m_rSearchThread->StopExecution();
         EndDialog( RET_OK );
     }
-    return 0;
 }
 
-IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*, /* pButton */ )
+IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void )
 {
     if( m_rSearchThread.is() )
         m_rSearchThread->StopExecution();
 
     EndDialog();
-    return 0;
 }
 
-IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton )
+IMPL_LINK_TYPED( SelectPersonaDialog, SelectPersona, Button*, pButton, void )
 {
     if( m_rSearchThread.is() )
         m_rSearchThread->StopExecution();
@@ -229,7 +226,6 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton )
             break;
         }
     }
-    return 0;
 }
 
 void SelectPersonaDialog::SetAppliedPersonaSetting( OUString& rPersonaSetting )
@@ -474,7 +470,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes()
     }
 }
 
-IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void )
 {
     ScopedVclPtrInstance< SelectPersonaDialog > aDialog(nullptr);
 
@@ -486,19 +482,15 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
             SetPersonaSettings( aPersonaSetting );
         }
     }
-
-    return 0;
 }
 
-IMPL_LINK( SvxPersonalizationTabPage, ForceSelect, RadioButton*, pButton )
+IMPL_LINK_TYPED( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void )
 {
     if ( pButton == m_pOwnPersona && m_aPersonaSettings.isEmpty() )
         SelectPersona( m_pSelectPersona );
-
-    return 0;
 }
 
-IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton )
+IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void )
 {
     m_pDefaultPersona->Check();
     for( sal_Int32 nIndex = 0; nIndex < 3; nIndex++ )
@@ -506,8 +498,6 @@ IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton )
         if( pButton == m_vDefaultPersonaImages[nIndex] )
             m_aPersonaSettings = m_vDefaultPersonaSettings[nIndex];
     }
-
-    return 0;
 }
 
 IMPL_LINK( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox*, )
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index f5805026a01f..59e9cbdf81a9 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -59,13 +59,13 @@ public:
 
 private:
     /// Handle the Persona selection
-    DECL_LINK( SelectPersona, PushButton* );
+    DECL_LINK_TYPED( SelectPersona, Button*, void );
 
     /// When 'own' is chosen, but the Persona is not chosen yet.
-    DECL_LINK( ForceSelect, RadioButton* );
+    DECL_LINK_TYPED( ForceSelect, Button*, void );
 
     /// Handle the default Persona selection
-    DECL_LINK( DefaultPersona, PushButton* );
+    DECL_LINK_TYPED( DefaultPersona, Button*, void );
 
     /// Handle the Personas installed through extensions selection
     DECL_LINK( SelectInstalledPersona, ListBox* );
@@ -107,10 +107,10 @@ public:
 
 private:
     /// Handle the Search button
-    DECL_LINK( SearchPersonas, PushButton* );
-    DECL_LINK( SelectPersona, PushButton* );
-    DECL_LINK( ActionOK, PushButton* );
-    DECL_LINK( ActionCancel, PushButton* );
+    DECL_LINK_TYPED( SearchPersonas, Button*, void );
+    DECL_LINK_TYPED( SelectPersona, Button*, void );
+    DECL_LINK_TYPED( ActionOK, Button*, void );
+    DECL_LINK_TYPED( ActionCancel, Button*, void );
 };
 
 class SearchAndParseThread: public salhelper::Thread
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3cb968246754..e83351f80191 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -657,7 +657,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl)
     return 0;
 }
 
-IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void)
 {
     if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
     {
@@ -674,10 +674,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
         else if ( pPageInfo->m_pExtPage )
             pPageInfo->m_pExtPage->ResetPage();
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void)
 {
     pTreeLB->EndSelection();
     if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
@@ -695,7 +694,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
                 {
                     // the page mustn't be left
                     pTreeLB->Select(pCurrentPageEntry);
-                    return 0;
+                    return;
                 }
             }
             pPageInfo->m_pPage->Hide();
@@ -724,7 +723,6 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
         pEntry = pTreeLB->Next(pEntry);
     }
     EndDialog(RET_OK);
-    return 0;
 }
 
 // an opened group shall be completely visible
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index a886975b4bab..82668264249f 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -50,7 +50,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
     }
 }
 
-IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, OKHdl_Impl, Button*, void)
 {
     std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
 
@@ -63,8 +63,6 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl)
     batch->commit();
 
     EndDialog(RET_OK);
-
-    return 0;
 }
 
 TSAURLsDialog::~TSAURLsDialog()
@@ -97,7 +95,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL)
     m_pURLListBox->SetUpdateMode(true);
 }
 
-IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void)
 {
     OUString aURL;
     OUString aDesc( get<FixedText>("enteraurl")->GetText() );
@@ -112,22 +110,18 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl)
         AddTSAURL(aURL);
         m_pOKBtn->Enable();
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl)
+IMPL_LINK_NOARG_TYPED(TSAURLsDialog, DeleteHdl_Impl, Button*, void)
 {
     sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos();
 
     if (nSel == LISTBOX_ENTRY_NOTFOUND)
-        return 0;
+        return;
 
     m_aURLs.erase(m_pURLListBox->GetEntry(nSel));
     m_pURLListBox->RemoveEntry(nSel);
     m_pOKBtn->Enable();
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx
index 421710113533..003c9771c27f 100644
--- a/cui/source/options/tsaurls.hxx
+++ b/cui/source/options/tsaurls.hxx
@@ -21,9 +21,9 @@ private:
     VclPtr<PushButton> m_pDeleteBtn;
     VclPtr<OKButton>   m_pOKBtn;
 
-    DECL_LINK(AddHdl_Impl, void *);
-    DECL_LINK(DeleteHdl_Impl, void *);
-    DECL_LINK(OKHdl_Impl, void *);
+    DECL_LINK_TYPED(AddHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void);
+    DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
 
     std::set<OUString> m_aURLs;
 
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 98e0b875d904..b58a7cbf2ee6 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -206,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList()
 }
 
 
-IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void)
 {
     try
     {
@@ -233,12 +233,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
     }
     catch( uno::Exception& )
     {}
-
-    return 0;
 }
 
 
-IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void)
 {
     try
     {
@@ -257,12 +255,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
     }
     catch( uno::Exception& )
     {}
-
-    return 0;
 }
 
 
-IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
+IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void)
 {
     try
     {
@@ -296,8 +292,6 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
     }
     catch( uno::Exception& )
     {}
-
-    return 0;
 }
 
 
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 9b830af762e3..02bf741eff6e 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -51,9 +51,9 @@ namespace svx
         sal_Int32      m_nPos;
 
     DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* );
-    DECL_LINK(RemovePasswordHdl, void *);
-    DECL_LINK(RemoveAllPasswordsHdl, void *);
-    DECL_LINK(ChangePasswordHdl, void *);
+    DECL_LINK_TYPED(RemovePasswordHdl, Button*, void);
+    DECL_LINK_TYPED(RemoveAllPasswordsHdl, Button*, void);
+    DECL_LINK_TYPED(ChangePasswordHdl, Button*, void);
     DECL_LINK( EntrySelectedHdl, void* );
 
     void FillPasswordList();