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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

31 files changed, 51 insertions, 79 deletions

diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 6c85546e8b5d..3226768e847a 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -218,22 +218,20 @@ namespace abp
     }
 
 
-    IMPL_LINK_NOARG(FinalPage, OnRegister)
+    IMPL_LINK_NOARG_TYPED(FinalPage, OnRegister, Button*, void)
     {
         bool bEnable = m_pRegisterName->IsChecked();
         m_pNameLabel->Enable(bEnable);
         m_pName->Enable(bEnable);
         implCheckName();
-        return 0L;
     }
 
-    IMPL_LINK_NOARG(FinalPage, OnEmbed)
+    IMPL_LINK_NOARG_TYPED(FinalPage, OnEmbed, Button*, void)
     {
         bool bEmbed = m_pEmbed->IsChecked();
         m_pLocationLabel->Enable(!bEmbed);
         m_pLocation->Enable(!bEmbed);
         m_pBrowse->Enable(!bEmbed);
-        return 0L;
     }
 
 }   // namespace abp
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index ceb1d0b66353..1a876545a814 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -68,8 +68,8 @@ namespace abp
 
     private:
         DECL_LINK( OnNameModified, Edit* );
-        DECL_LINK(OnRegister, void *);
-        DECL_LINK(OnEmbed, void *);
+        DECL_LINK_TYPED(OnRegister, Button*, void);
+        DECL_LINK_TYPED(OnEmbed, Button*, void);
 
         bool    isValidName() const;
         void        implCheckName();
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 1ef0ebe0331c..7254eb8f8505 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -179,17 +179,15 @@ namespace abp
     }
 
 
-    IMPL_LINK_NOARG( OAddessBookSourcePilot, OnCancelClicked )
+    IMPL_LINK_NOARG_TYPED( OAddessBookSourcePilot, OnCancelClicked, Button*, void )
     {
         // do cleanups
         implCleanup();
 
         // reset the click hdl
-        m_pCancel->SetClickHdl( Link<>() );
+        m_pCancel->SetClickHdl( Link<Button*, void>() );
         // simulate the click again - this time, the default handling of the button will strike ....
         m_pCancel->Click();
-
-        return 0L;
     }
 
 
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 28deb987b8de..93ed19897841 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -74,7 +74,7 @@ namespace abp
         virtual bool    Close() SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnCancelClicked, void* );
+        DECL_LINK_TYPED( OnCancelClicked, Button*, void );
 
         /** creates a new data source of the type indicated by m_aSettings
             <p>If another data source has been created before, this one is deleted.</p>
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index 39c0bde0f6e8..b89c33123574 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -82,7 +82,7 @@ namespace abp
         return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
     }
 
-    IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog )
+    IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void )
     {
         OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
         if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) )
@@ -90,8 +90,6 @@ namespace abp
             // try to connect to this data source
             implTryConnect();
         }
-
-        return 0L;
     }
 
 }   // namespace abp
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 39d255d4ed78..36153d07f94a 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -46,7 +46,7 @@ namespace abp
         virtual bool        canAdvance() const SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnInvokeAdminDialog, void* );
+        DECL_LINK_TYPED( OnInvokeAdminDialog, Button*, void );
 
         void implTryConnect();
         void implUpdateErrorMessage();
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 515c4f4a464d..64180983d3b8 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -78,7 +78,7 @@ namespace abp
     }
 
 
-    IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog )
+    IMPL_LINK_NOARG_TYPED( FieldMappingPage, OnInvokeDialog, Button*, void )
     {
         AddressSettings& rSettings = getSettings();
 
@@ -90,8 +90,6 @@ namespace abp
             else
                 implUpdateHint();
         }
-
-        return 0L;
     }
 
 
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 9a4c81a2b7dd..5244ddb9d62d 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -46,7 +46,7 @@ namespace abp
         virtual void        DeactivatePage() SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnInvokeDialog, void* );
+        DECL_LINK_TYPED( OnInvokeDialog, Button*, void );
 
         void implUpdateHint();
     };
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 90bdf31a0ce7..bf2e9b2e02ea 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -133,7 +133,7 @@ namespace abp
         m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) );
         m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) );
 
-        Link<> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+        Link<Button*,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
               loop != m_aAllTypes.end(); ++loop )
         {
@@ -262,11 +262,10 @@ namespace abp
     }
 
 
-    IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected )
+    IMPL_LINK_NOARG_TYPED( TypeSelectionPage, OnTypeSelected, Button*, void )
     {
         getDialog()->typeSelectionChanged( getSelectedType() );
         updateDialogTravelUI();
-        return 0L;
     }
 
 
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index b5d4dad096cb..d5f13a880aed 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -81,7 +81,7 @@ namespace abp
         virtual bool        canAdvance() const SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnTypeSelected, void* );
+        DECL_LINK_TYPED( OnTypeSelected, Button*, void );
 
         void                selectType( AddressSourceType _eType );
     };
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 44c8c9a84745..6a6e44d6d273 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -236,7 +236,7 @@ class MappingDialog_Impl : public ModalDialog
 
 
 
-    DECL_LINK(OkHdl, void *);
+    DECL_LINK_TYPED(OkHdl, Button*, void);
     DECL_LINK(ListBoxSelectHdl, ListBox*);
 
 public:
@@ -437,7 +437,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
     return 0;
 }
 
-IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl)
+IMPL_LINK_NOARG_TYPED(MappingDialog_Impl, OkHdl, Button*, void)
 {
     if(bModified)
     {
@@ -465,7 +465,6 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl)
         pConfig->SetMapping(aDesc, &aNew);
     }
     EndDialog(bModified ? RET_OK : RET_CANCEL);
-    return 0;
 }
 
 class DBChangeDialog_Impl : public ModalDialog
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 48a27d87348a..3cd5c75fb8e8 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -193,7 +193,7 @@ namespace dbp
     }
 
 
-    IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ )
+    IMPL_LINK_NOARG_TYPED( OTableSelectionPage, OnSearchClicked, Button*, void )
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
@@ -215,7 +215,6 @@ namespace dbp
             m_pDatasource->SelectEntry(sDataSourceName);
             LINK(this, OTableSelectionPage, OnListboxSelection).Call(m_pDatasource);
         }
-        return 0L;
     }
 
     IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox )
@@ -232,9 +231,6 @@ namespace dbp
         {   // new data source selected
             implFillTables();
         }
-        else
-        {
-        }
 
         updateDialogTravelUI();
 
@@ -416,10 +412,9 @@ namespace dbp
         implEnableWindows();
     }
 
-    IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ )
+    IMPL_LINK_NOARG_TYPED( OMaybeListSelectionPage, OnRadioSelected, Button*, void )
     {
         implEnableWindows();
-        return 0L;
     }
 
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index d8f3383fb86b..7b8131fb1f00 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -56,7 +56,7 @@ namespace dbp
     protected:
         DECL_LINK( OnListboxSelection, ListBox* );
         DECL_LINK( OnListboxDoubleClicked, ListBox* );
-        DECL_LINK( OnSearchClicked, PushButton* );
+        DECL_LINK_TYPED( OnSearchClicked, Button*, void );
 
         void implCollectDatasource();
         void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
@@ -79,7 +79,7 @@ namespace dbp
         virtual void dispose() SAL_OVERRIDE;
 
     protected:
-        DECL_LINK( OnRadioSelected, RadioButton* );
+        DECL_LINK_TYPED( OnRadioSelected, Button*, void );
 
         // TabPage overridables
         void ActivatePage() SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 9b550424c2e2..480b9ec283b6 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -395,7 +395,10 @@ namespace dbp
     {
         PushButton* pSimulateButton = m_pExistFields == _pList ? m_pSelectOne : m_pDeselectOne;
         if (pSimulateButton->IsEnabled())
-            return OnMoveOneEntry( pSimulateButton );
+        {
+            OnMoveOneEntry( pSimulateButton );
+            return 0;
+        }
         else
             return 1L;
     }
@@ -408,7 +411,7 @@ namespace dbp
     }
 
 
-    IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton)
+    IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void)
     {
         bool bMoveRight = (m_pSelectOne == _pButton);
         ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields;
@@ -459,11 +462,10 @@ namespace dbp
         }
 
         implCheckButtons();
-        return 0;
     }
 
 
-    IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton)
+    IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void)
     {
         bool bMoveRight = (m_pSelectAll == _pButton);
         m_pExistFields->Clear();
@@ -471,7 +473,6 @@ namespace dbp
         fillListBox(bMoveRight ? *m_pSelFields : *m_pExistFields, getContext().aFieldNames);
 
         implCheckButtons();
-        return 0;
     }
 
 
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 1cbb7ebd23cf..89f311b268cc 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -94,8 +94,8 @@ namespace dbp
         virtual bool        canAdvance() const SAL_OVERRIDE;
 
     protected:
-        DECL_LINK(OnMoveOneEntry, PushButton*);
-        DECL_LINK(OnMoveAllEntries, PushButton*);
+        DECL_LINK_TYPED(OnMoveOneEntry, Button*, void);
+        DECL_LINK_TYPED(OnMoveAllEntries, Button*, void);
         DECL_LINK(OnEntrySelected, ListBox*);
         DECL_LINK(OnEntryDoubleClicked, ListBox*);
 
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 8cfd5cfd49fd..5faaa92a04b4 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -261,7 +261,7 @@ namespace dbp
     }
 
 
-    IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton )
+    IMPL_LINK_TYPED( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void )
     {
         bool bMoveLeft = (m_pMoveLeft == _pButton);
         if (bMoveLeft)
@@ -282,7 +282,6 @@ namespace dbp
             m_pExistingRadios->GrabFocus();
         else
             m_pRadioName->GrabFocus();
-        return 0L;
     }
 
 
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index aeae81d10899..453a93dd141a 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -100,7 +100,7 @@ namespace dbp
         virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
         virtual bool        canAdvance() const SAL_OVERRIDE;
 
-        DECL_LINK( OnMoveEntry, PushButton* );
+        DECL_LINK_TYPED( OnMoveEntry, Button*, void );
         DECL_LINK( OnEntrySelected, ListBox* );
         DECL_LINK( OnNameModified, Edit* );
 
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index ba8b190b9c15..37bf731a357a 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -478,12 +478,10 @@ namespace pcr
     }
 
 
-    IMPL_LINK( OBrowserLine, OnButtonClicked, PushButton*, _pButton )
+    IMPL_LINK_TYPED( OBrowserLine, OnButtonClicked, Button*, _pButton, void )
     {
         if ( m_pClickListener )
             m_pClickListener->buttonClicked( this, _pButton == m_pBrowseButton );
-
-        return 0L;
     }
 
 
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 35c26523d1bb..c28c7861a775 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -114,7 +114,7 @@ namespace pcr
         void                IndentTitle( bool _bIndent );
 
     private:
-        DECL_LINK( OnButtonClicked, PushButton* );
+        DECL_LINK_TYPED( OnButtonClicked, Button*, void );
         DECL_LINK( OnButtonFocus, PushButton* );
 
         void    implHideBrowseButton( bool _bPrimary, bool _bReLayout );
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 7101fe6fee12..1028a0e2cede 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -660,10 +660,9 @@ namespace pcr
     }
 
 
-    IMPL_LINK_NOARG( FormLinkDialog, OnSuggest )
+    IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnSuggest, Button*, void )
     {
         initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns );
-        return 0L;
     }
 
 
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 9ce65e8377ce..044432c2bed0 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -86,7 +86,7 @@ namespace pcr
         virtual short   Execute() SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnSuggest,          void*         );
+        DECL_LINK_TYPED( OnSuggest,    Button*, void );
         DECL_LINK( OnFieldChanged,     FieldLinkRow* );
         DECL_LINK( OnInitialize, void*         );
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index cc842f9bca9e..02dbf3b2f17b 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -250,7 +250,7 @@ namespace pcr
         if (pData)
             m_xSelectedControl = Reference< XPropertySet > (*static_cast<Reference< XPropertySet > *>(pData));
 
-        m_pNoAssignment->SetClickHdl(Link<>());
+        m_pNoAssignment->SetClickHdl(Link<Button*,void>());
         m_pNoAssignment->Check(pData == NULL);
         m_pNoAssignment->SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked));
 
@@ -258,7 +258,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton)
+    IMPL_LINK_TYPED(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void)
     {
         DBG_ASSERT(pButton == m_pNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?");
         (void)pButton;
@@ -292,8 +292,6 @@ namespace pcr
             m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
             m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
         }
-
-        return 0L;
     }
 
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 45144c646738..146381112358 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -66,7 +66,7 @@ namespace pcr
         sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry);
 
         DECL_LINK(OnEntrySelected, SvTreeListBox*);
-        DECL_LINK(OnNoAssignmentClicked, Button*);
+        DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void);
     };
 
 
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index bdd97c67464c..94d3ee4cd57c 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1322,10 +1322,9 @@ namespace pcr
     }
 
 
-    IMPL_LINK( DropDownEditControl, DropDownHdl, PushButton*, /*pPb*/ )
+    IMPL_LINK_NOARG_TYPED( DropDownEditControl, DropDownHdl, Button*, void )
     {
         ShowDropDown(!m_bDropdown);
-        return 0;
     }
 
 
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index c85ef521935c..22edd9703358 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -407,7 +407,7 @@ namespace pcr
 
     private:
         DECL_LINK( ReturnHdl, OMultilineFloatingEdit* );
-        DECL_LINK( DropDownHdl, PushButton* );
+        DECL_LINK_TYPED( DropDownHdl, Button*, void );
 
         bool ShowDropDown( bool bShow );
     };
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index ec114bd3ba4c..c3342d1e36e5 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -224,21 +224,19 @@ namespace pcr
     }
 
 
-    IMPL_LINK( TabOrderDialog, MoveUpClickHdl, Button*, /*pButton*/ )
+    IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveUpClickHdl, Button*, void )
     {
         m_pLB_Controls->MoveSelection( -1 );
-        return 0;
     }
 
 
-    IMPL_LINK( TabOrderDialog, MoveDownClickHdl, Button*, /*pButton*/ )
+    IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveDownClickHdl, Button*, void )
     {
         m_pLB_Controls->MoveSelection( 1 );
-        return 0;
     }
 
 
-    IMPL_LINK( TabOrderDialog, AutoOrderClickHdl, Button*, /*pButton*/ )
+    IMPL_LINK_NOARG_TYPED( TabOrderDialog, AutoOrderClickHdl, Button*, void )
     {
         try
         {
@@ -257,12 +255,10 @@ namespace pcr
         {
             OSL_FAIL( "TabOrderDialog::AutoOrderClickHdl: caught an exception!" );
         }
-
-        return 0;
     }
 
 
-    IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ )
+    IMPL_LINK_NOARG_TYPED( TabOrderDialog, OKClickHdl, Button*, void )
     {
         sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount();
         Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount );
@@ -289,7 +285,6 @@ namespace pcr
         m_xModel->setControlModels( aSortedControlModelSeq );
 
         EndDialog( RET_OK );
-        return 0;
     }
 
 
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index f56d4b45bc01..4c6724587b6a 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -83,10 +83,10 @@ namespace pcr
 
         ImageList*                  pImageList;
 
-        DECL_LINK( MoveUpClickHdl, Button* );
-        DECL_LINK( MoveDownClickHdl, Button* );
-        DECL_LINK( AutoOrderClickHdl, Button* );
-        DECL_LINK( OKClickHdl, Button* );
+        DECL_LINK_TYPED( MoveUpClickHdl, Button*, void );
+        DECL_LINK_TYPED( MoveDownClickHdl, Button*, void );
+        DECL_LINK_TYPED( AutoOrderClickHdl, Button*, void );
+        DECL_LINK_TYPED( OKClickHdl, Button*, void );
 
         void FillList();
         Image GetImage(
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 67a47a6e9394..e5d8af874cdd 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -705,14 +705,13 @@ void GridWindow::ChangeMode(int nType)
     Invalidate();
 }
 
-IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton )
+IMPL_LINK_TYPED( GridDialog, ClickButtonHdl, Button*, pButton, void )
 {
     if (pButton == m_pResetButton)
     {
         int nType = m_pResetTypeBox->GetSelectEntryPos();
         m_pGridWindow->ChangeMode(nType);
     }
-    return 0;
 }
 
 double* GridDialog::getNewYValues()
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 940dec60097e..be4e239e4dd0 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -44,7 +44,7 @@ class GridDialog : public ModalDialog
 
     VclPtr<GridWindow>     m_pGridWindow;
 
-    DECL_LINK( ClickButtonHdl, Button* );
+    DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
 
 public:
     GridDialog(double* pXValues, double* pYValues, int nValues,
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index f17bbe8b63d1..4895bd7cbfcf 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -607,7 +607,7 @@ void SaneDlg::InitFields()
     }
 }
 
-IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
+IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void )
 {
     if( mrSane.IsOpen() )
     {
@@ -679,7 +679,6 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
         mrSane.Close();
         EndDialog();
     }
-    return 0;
 }
 
 IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox )
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 7e689221f037..602bace9bea9 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -80,7 +80,7 @@ private:
 
     bool            doScan;
 
-    DECL_LINK( ClickBtnHdl, Button* );
+    DECL_LINK_TYPED( ClickBtnHdl, Button*, void );
     DECL_LINK( SelectHdl, ListBox* );
     DECL_LINK( ModifyHdl, Edit* );
     DECL_LINK( ReloadSaneOptionsHdl, Sane* );