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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

40 files changed, 197 insertions, 245 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 23d36acd5341..03c79109ebfb 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -939,7 +939,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 }
 
 // Clickhandler for the radiobuttons of the design-selection
-IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
+IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 {
     if(pButton == pPage1_NewDesign)
     {
@@ -968,8 +968,6 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton )
         if(m_pDesign)
             SetDesign(m_pDesign);
     }
-
-    return 0;
 }
 
 // Clickhandler for the choice of one design
@@ -988,7 +986,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
 }
 
 // Clickhandler for the delete of one design
-IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 {
     sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos();
 
@@ -1006,42 +1004,35 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl)
     m_bDesignListDirty = true;
 
     UpdatePage();
-
-    return 0;
 }
 
 // Clickhandler for the other servertypess
-IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton )
+IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
 {
     bool bASP = pButton == pPage2_ASP;
 
     pPage2_ASP->Check( bASP );
     pPage2_PERL->Check( !bASP );
     UpdatePage();
-
-    return 0;
 }
 
 // Clickhandler for the Radiobuttons of the graphicformat choice
-IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton )
+IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
 {
     pPage3_Png->Check( pButton == pPage3_Png );
     pPage3_Gif->Check( pButton == pPage3_Gif );
     pPage3_Jpg->Check( pButton == pPage3_Jpg );
     pPage3_Quality->Enable(pButton == pPage3_Jpg);
-    return 0;
 }
 
 // Clickhandler for the Radiobuttons Standard/Frames
-IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, BaseHdl, Button*, void)
 {
     UpdatePage();
-
-    return 0;
 }
 
 // Clickhandler for the Checkbox of the Title page
-IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void)
 {
     if(pPage2_Content->IsChecked())
     {
@@ -1059,17 +1050,14 @@ IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl)
             UpdatePage();
         }
     }
-    return 0;
 }
 
 // Clickhandler for the Resolution Radiobuttons
-IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton )
+IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 {
     pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1);
     pPage3_Resolution_2->Check(pButton == pPage3_Resolution_2);
     pPage3_Resolution_3->Check(pButton == pPage3_Resolution_3);
-
-    return 0;
 }
 
 // Clickhandler for the ValueSet with the bitmap-buttons
@@ -1081,7 +1069,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl)
 }
 
 // Fill the SfxItemSet with the settings of the dialog
-IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton)
+IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void)
 {
     SvColorDialog aDlg(this);
 
@@ -1120,17 +1108,15 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton)
     pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor,
                                m_aVLinkColor, m_aALinkColor );
     pPage6_Preview->Invalidate();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, SlideChgHdl, Button*, void)
 {
     UpdatePage();
-    return 0;
 }
 
 // Clickhandler for the Ok Button
-IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, FinishHdl, Button*, void)
 {
     //End
     SdPublishingDesign* pDesign = new SdPublishingDesign();
@@ -1202,7 +1188,6 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
         Save();
 
     EndDialog(RET_OK);
-    return 0;
 }
 
 // Refresh the dialogs when changing from pages
@@ -1381,11 +1366,10 @@ void SdPublishingDlg::LoadPreviewButtons()
 }
 
 // Clickhandler for the Forward Button
-IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, NextPageHdl, Button*, void)
 {
     aAssistentFunc.NextPage();
     ChangePage();
-    return 0;
 }
 
 // Sets the Controls in the dialog to the settings in the design
@@ -1527,11 +1511,10 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
 }
 
 // Clickhandler for the back Button
-IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void)
 {
     aAssistentFunc.PreviousPage();
     ChangePage();
-    return 0;
 }
 
 // Load Designs
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index fb1e256c4305..032273a1a8b5 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -989,6 +989,7 @@ public:
 
     void update( STLPropertySet* pSet );
     DECL_LINK( implSelectHdl, Control* );
+    DECL_LINK_TYPED( implClickHdl, Button*, void );
 
 private:
     void updateControlStates();
@@ -1051,7 +1052,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent
 
     mpLBSound->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) );
 
-    mpPBSoundPreview->SetClickHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) );
+    mpPBSoundPreview->SetClickHdl( LINK( this, CustomAnimationEffectTabPage, implClickHdl ) );
 
     // fill the color box
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
@@ -1298,6 +1299,11 @@ void CustomAnimationEffectTabPage::updateControlStates()
     mpPBSoundPreview->Enable( nPos >= 2 );
 }
 
+IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void )
+{
+    implSelectHdl(pBtn);
+}
+
 IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl )
 {
     if( pControl == mpLBAfterEffect )
@@ -1586,6 +1592,7 @@ public:
     void update( STLPropertySet* pSet );
 
     DECL_LINK( implControlHdl, Control* );
+    DECL_LINK_TYPED( implClickHdl, Button*, void );
 
 private:
     const STLPropertySet* mpSet;
@@ -1624,7 +1631,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
     fillRepeatComboBox( mpCBRepeat );
     fillDurationComboBox( mpCBDuration );
 
-    mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
+    mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implClickHdl ) );
     mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) );
 
     if( pSet->getPropertyState( nHandleStart ) != STLPropertyState_AMBIGUOUS )
@@ -1799,6 +1806,11 @@ void CustomAnimationDurationTabPage::dispose()
     TabPage::dispose();
 }
 
+IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void )
+{
+    implControlHdl(pBtn);
+}
+
 IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
 {
     if( pControl == mpLBTrigger )
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c34370f11fae..9e60afde537e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -187,16 +187,16 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
 
     fillDurationComboBox( mpCBSpeed );
 
-    mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
+    mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
     mpLBStart->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
     mpCBSpeed->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
+    mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
+    mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
 
     maStrModify = mpFTEffect->GetText();
 
@@ -2020,6 +2020,11 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl)
     return 0;
 }
 
+IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void )
+{
+    implControlHdl(pBtn);
+}
+
 /// this link is called when one of the controls is modified
 IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl )
 {
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 0a1b87b6d5dc..5760860f7f33 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -117,6 +117,7 @@ private:
     void UpdateLook();
 
     DECL_LINK( implControlHdl, Control* );
+    DECL_LINK_TYPED( implClickHdl, Button*, void );
     DECL_LINK(implPropertyHdl, void *);
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
     DECL_LINK_TYPED(lateInitCallback, Timer *, void);
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 05121ceae9de..91285b05c9d5 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -969,11 +969,11 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
     return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void)
 {
     DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" );
     if( !mpDrawDoc )
-        return 0;
+        return;
 
     ::sd::slidesorter::SharedPageSelection pPages (
         new ::sd::slidesorter::SlideSorterViewShell::PageSelection());
@@ -992,14 +992,11 @@ IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked)
         lcl_CreateUndoForPages( pPages, mrBase );
         lcl_ApplyToPages( pPages, getTransitionEffectFromControls() );
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, PlayButtonClicked, Button*, void)
 {
     playCurrentEffect();
-    return 0;
 }
 
 IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected)
@@ -1043,17 +1040,15 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected)
     return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LoopSoundBoxChecked, Button*, void)
 {
     applyToSelectedPages();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AutoPreviewClicked, Button*, void)
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
     pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() );
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void)
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index eac11eba8b94..ab640bfa161b 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -85,16 +85,16 @@ private:
 
     void UpdateLook();
 
-    DECL_LINK( ApplyToAllButtonClicked, void * );
-    DECL_LINK( PlayButtonClicked, void * );
-    DECL_LINK( AutoPreviewClicked, void * );
+    DECL_LINK_TYPED( ApplyToAllButtonClicked, Button*, void );
+    DECL_LINK_TYPED( PlayButtonClicked, Button*, void );
+    DECL_LINK_TYPED( AutoPreviewClicked, Button*, void );
 
     DECL_LINK( TransitionSelected, void * );
     DECL_LINK( AdvanceSlideRadioButtonToggled, void * );
     DECL_LINK( AdvanceTimeModified, void * );
     DECL_LINK( SpeedListBoxSelected, void * );
     DECL_LINK( SoundListBoxSelected, void * );
-    DECL_LINK( LoopSoundBoxChecked, void * );
+    DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void );
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
     DECL_LINK_TYPED(LateInitCallback, Timer *, void);
 
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index fe664700d343..0c9838a5cfdf 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -95,13 +95,12 @@ void SdPhotoAlbumDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, CancelHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CancelHdl, Button*, void)
 {
     Close();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
 {
     if (pImagesLst->GetEntryCount() == 0)
     {
@@ -466,12 +465,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl)
             aInfo->Execute();
         }
         EndDialog();
-        return 0;
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void)
 {
     ::sfx2::FileDialogHelper aDlg(
         css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
@@ -510,10 +507,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
         }
     }
     EnableDisableButtons();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void)
 {
     if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
         && pImagesLst->GetSelectEntryPos() != 0)
@@ -542,10 +538,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
     }
 
     EnableDisableButtons();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void)
 {
     sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos();
     if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
@@ -571,16 +566,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl)
 
     }
     EnableDisableButtons();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
 {
     pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() );
     pImg->SetImage(Image());
 
     EnableDisableButtons();
-    return 0;
 }
 
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 05748b3a673b..723f20aa4ef7 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -70,14 +70,14 @@ private:
     SdDrawDocument* pDoc;
     GraphicFilter* mpGraphicFilter;
 
-    DECL_LINK(CancelHdl, void*);
-    DECL_LINK(CreateHdl, void*);
+    DECL_LINK_TYPED(CancelHdl, Button*, void);
+    DECL_LINK_TYPED(CreateHdl, Button*, void);
 
-    DECL_LINK(FileHdl, void*);
+    DECL_LINK_TYPED(FileHdl, Button*, void);
     DECL_LINK(TextHdl, void*);
-    DECL_LINK(UpHdl, void*);
-    DECL_LINK(DownHdl, void*);
-    DECL_LINK(RemoveHdl, void*);
+    DECL_LINK_TYPED(UpHdl, Button*, void);
+    DECL_LINK_TYPED(DownHdl, Button*, void);
+    DECL_LINK_TYPED(RemoveHdl, Button*, void);
 
     DECL_LINK(SelectHdl, void*);
 
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 62c9d3eaffe7..06f70ef3f49a 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -27,7 +27,7 @@ RemoteDialog::RemoteDialog( vcl::Window *pWindow )
 
     m_pButtonConnect->SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton ) );
     SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) );
-    m_pButtonClose->SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
+    m_pButtonClose->SetClickHdl( LINK( this, RemoteDialog, CloseClickHdl ) );
 }
 
 RemoteDialog::~RemoteDialog()
@@ -43,29 +43,27 @@ void RemoteDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
+IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void)
 {
 //     setBusy( true );
     // Fixme: Try and connect
 #if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH)
     long aSelected = m_pClientBox->GetActiveEntryIndex();
     if ( aSelected < 0 )
-        return 1;
+        return;
     TClientBoxEntry aEntry = m_pClientBox->GetEntryData(aSelected);
     OUString aPin ( m_pClientBox->getPin() );
     if ( RemoteServer::connectClient( aEntry->m_pClientInfo, aPin ) )
     {
-        return CloseHdl( 0 );
+        CloseHdl( 0 );
     }
-    else
-    {
-        return 1;
-    }
-#else
-    return 0;
 #endif
 }
 
+IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseClickHdl, Button*, void )
+{
+    CloseHdl(NULL);
+}
 IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
 {
 #ifdef ENABLE_SDREMOTE
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index 3c936eb10a1a..764d84469ef7 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -28,8 +28,9 @@ private:
     VclPtr<CloseButton>    m_pButtonClose;
     VclPtr<ClientBox>      m_pClientBox;
 
-    DECL_DLLPRIVATE_LINK( HandleConnectButton, void * );
-    DECL_LINK( CloseHdl, void * );
+    DECL_DLLPRIVATE_LINK_TYPED( HandleConnectButton, Button*, void );
+    DECL_LINK( CloseHdl, void* );
+    DECL_LINK_TYPED( CloseClickHdl, Button*, void );
 public:
     RemoteDialog( vcl::Window* pWindow );
     virtual ~RemoteDialog();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 7ecfae4f181c..f18454650d51 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -726,18 +726,17 @@ IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar )
     return 1;
 }
 
-IMPL_LINK_NOARG( ClientBox, DeauthoriseHdl )
+IMPL_LINK_NOARG_TYPED( ClientBox, DeauthoriseHdl, Button*, void )
 {
     long aSelected = GetActiveEntryIndex();
     if ( aSelected < 0 )
-        return 1;
+        return;
     TClientBoxEntry aEntry = GetEntryData(aSelected);
 
 #ifdef ENABLE_SDREMOTE
     RemoteServer::deauthoriseClient( aEntry->m_pClientInfo );
 #endif
     populateEntries();
-    return 1;
 }
 
 } //namespace dp_gui
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 5f60f8572a2a..6a1439b7301d 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -131,7 +131,7 @@ class ClientBox : public Control
     void DeleteRemoved();
 
     DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* );
-    DECL_DLLPRIVATE_LINK( DeauthoriseHdl, void * );
+    DECL_DLLPRIVATE_LINK_TYPED( DeauthoriseHdl, Button*, void );
     //Index starts with 1.
     //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid.
     void checkIndex(sal_Int32 pos) const;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index f414121b1e65..8e3989c42acd 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -247,21 +247,18 @@ void AnimationWindow::dispose()
     SfxDockingWindow::dispose();
 }
 
-IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl)
+IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickFirstHdl, Button*, void)
 {
     m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0;
     UpdateControl();
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl)
+IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickStopHdl, Button*, void)
 {
     bMovie = false;
-    return 0L;
 }
 
-IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
+IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void )
 {
     ScopeLockGuard aGuard( maPlayLock );
 
@@ -376,20 +373,16 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
     m_pRbtGroup->Enable( bRbtGroupEnabled );
     m_pBtnGetAllObjects->Enable( bBtnGetAllObjectsEnabled );
     m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled );
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl)
+IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickLastHdl, Button*, void)
 {
     m_nCurrentFrame =
         (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ;
     UpdateControl();
-
-    return 0L;
 }
 
-IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
+IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void )
 {
     if (m_FrameList.empty() || p == m_pRbtGroup || m_pRbtGroup->IsChecked())
     {
@@ -409,11 +402,9 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
         m_pTimeField->Enable();
         m_pLbLoopCount->Enable();
     }
-
-    return 0L;
 }
 
-IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
+IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void )
 {
     bAllObjects = pBtn == m_pBtnGetAllObjects;
 
@@ -422,10 +413,9 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
 
     GetBindings().GetDispatcher()->Execute(
         SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
-    return 0L;
 }
 
-IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
+IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
 {
     SdPage*     pPage = pMyDoc->GetSdPage(0, PK_STANDARD);
     SdrObject*  pObject;
@@ -496,18 +486,15 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
     m_pCtlDisplay->SetScale(aFrac);
 
     UpdateControl();
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
+IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void)
 {
     // Code now in CreatePresObj()
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, true );
 
     GetBindings().GetDispatcher()->Execute(
         SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L );
-    return 0L;
 }
 
 IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl)
@@ -1130,7 +1117,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
         }
     }
 
-    ClickFirstHdl( this );
+    ClickFirstHdl( NULL );
 }
 
 void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index d02f13128b80..f40bcce6af70 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -84,11 +84,10 @@ void BreakDlg::dispose()
 }
 
 // Control-Handler for cancel button
-IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl)
+IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void)
 {
-  bCancel = true;
-  m_pBtnCancel->Disable();
-  return 0L;
+    bCancel = true;
+    m_pBtnCancel->Disable();
 }
 
 /**
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index b87f58e0908c..86421fde3f0c 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -238,7 +238,7 @@ IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
 /**
  * sets values of selection
  */
-IMPL_LINK_NOARG(CopyDlg, SetViewData)
+IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void)
 {
     Rectangle aRect = mpView->GetAllMarkedRect();
 
@@ -254,14 +254,12 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData)
         Color aColor = static_cast<const XColorItem*>( pPoolItem )->GetColorValue();
         m_pLbStartColor->SelectEntry( aColor );
     }
-
-    return 0;
 }
 
 /**
  * resets values to default
  */
-IMPL_LINK_NOARG(CopyDlg, SetDefault)
+IMPL_LINK_NOARG_TYPED(CopyDlg, SetDefault, Button*, void)
 {
     m_pNumFldCopies->SetValue( 1L );
 
@@ -282,8 +280,6 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault)
         m_pLbStartColor->SelectEntry( aColor );
         m_pLbEndColor->SelectEntry( aColor );
     }
-
-    return 0;
 }
 
 } // end of namespace sd
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 27c3a8695408..47a139645938 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -52,13 +52,13 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow,
     m_pLbCustomShows->set_width_request(m_pLbCustomShows->approximate_char_width() * 32);
     m_pLbCustomShows->SetDropDownLineCount(8);
 
-    Link<> aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) );
+    Link<Button*,void> aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) );
     m_pBtnNew->SetClickHdl( aLink );
     m_pBtnEdit->SetClickHdl( aLink );
     m_pBtnRemove->SetClickHdl( aLink );
     m_pBtnCopy->SetClickHdl( aLink );
     m_pCbxUseCustomShow->SetClickHdl( aLink );
-    m_pLbCustomShows->SetSelectHdl( aLink );
+    m_pLbCustomShows->SetSelectHdl( LINK( this, SdCustomShowDlg, SelectHdl ) );
 
     m_pBtnStartShow->SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test
 
@@ -117,10 +117,14 @@ void SdCustomShowDlg::CheckState()
         pCustomShowList->Seek( nPos );
 }
 
+IMPL_LINK_TYPED( SdCustomShowDlg, ClickButtonHdl, Button *, p, void )
+{
+    SelectHdl(p);
+}
 /**
  * ButtonHdl()
  */
-IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
+IMPL_LINK( SdCustomShowDlg, SelectHdl, void *, p )
 {
     // new CustomShow
     if( p == m_pBtnNew )
@@ -262,11 +266,9 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
 }
 
 // StartShow-Hdl
-IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl)
+IMPL_LINK_NOARG_TYPED(SdCustomShowDlg, StartShowHdl, Button*, void)
 {
     EndDialog( RET_YES );
-
-    return 0;
 }
 
 // CheckState
@@ -292,12 +294,13 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
     get( m_pBtnCancel, "cancel" );
     get( m_pBtnHelp, "help" );
 
-    Link<> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
+    Link<Button*,void> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
+    Link<> aLink2= LINK( this, SdDefineCustomShowDlg, ClickButtonHdl2 );
     m_pBtnAdd->SetClickHdl( aLink );
     m_pBtnRemove->SetClickHdl( aLink );
-    m_pEdtName->SetModifyHdl( aLink );
-    m_pLbPages->SetSelectHdl( aLink ); // because of status
-    m_pLbCustomPages->SetSelectHdl( aLink ); // because of status
+    m_pEdtName->SetModifyHdl( aLink2 );
+    m_pLbPages->SetSelectHdl( aLink2 ); // because of status
+    m_pLbCustomPages->SetSelectHdl( aLink2 ); // because of status
 
     m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
 
@@ -380,8 +383,12 @@ void SdDefineCustomShowDlg::CheckState()
     m_pBtnRemove->Enable( bCSPages );
 }
 
+IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void )
+{
+    ClickButtonHdl2(p);
+}
 // ButtonHdl()
-IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
+IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl2, void *, p )
 {
     if( p == m_pBtnAdd )
     {
@@ -486,7 +493,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
 }
 
 // OK-Hdl
-IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl)
+IMPL_LINK_NOARG_TYPED(SdDefineCustomShowDlg, OKHdl, Button*, void)
 {
     // check name...
     bool bDifferent = true;
@@ -520,8 +527,6 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl)
 
         m_pEdtName->GrabFocus();
     }
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 9a1f0c7fd2a2..2f67a4d46861 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -96,7 +96,7 @@ public:
     NextButton (vcl::Window* pParent);
 
     void ForceFocusEventBroadcast();
-    void SetClickHdl (const Link<>& rLink);
+    void SetClickHdl (const Link<Button*,void>& rLink);
     bool IsEnabled();
     void Enable (bool bEnable);
 
@@ -229,19 +229,19 @@ public:
     DECL_LINK( SelectRegionHdl, ListBox * );
     DECL_LINK_TYPED( UpdatePreviewHdl, Idle *, void );
     DECL_LINK_TYPED( UpdatePageListHdl, Idle *, void );
-    DECL_LINK( StartTypeHdl, RadioButton * );
+    DECL_LINK_TYPED( StartTypeHdl, Button *, void );
     DECL_LINK( SelectTemplateHdl, void * );
-    DECL_LINK( NextPageHdl, void * );
-    DECL_LINK( LastPageHdl, void * );
-    DECL_LINK( PreviewFlagHdl, void * );
+    DECL_LINK_TYPED( NextPageHdl, Button*, void );
+    DECL_LINK_TYPED( LastPageHdl, Button*, void );
+    DECL_LINK_TYPED( PreviewFlagHdl, Button*, void );
     DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void );
     DECL_LINK( EffectPreviewClickHdl, void * );
     DECL_LINK( SelectLayoutHdl, void * );
     DECL_LINK( PageSelectHdl, void * );
-    DECL_LINK( PresTypeHdl, void * );
+    DECL_LINK_TYPED( PresTypeHdl, Button*, void );
     DECL_LINK( UpdateUserDataHdl, void * );
     DECL_LINK( SelectEffectHdl, void* );
-    DECL_LINK( OpenButtonHdl, Button * );
+    DECL_LINK_TYPED( OpenButtonHdl, Button *, void );
 
     OUString            maCreateStr;
     OUString            maOpenStr;
@@ -1101,11 +1101,11 @@ IMPL_LINK_NOARG(AssistentDlgImpl, SelectEffectHdl)
     return 0;
 }
 
-IMPL_LINK( AssistentDlgImpl, OpenButtonHdl, Button*, pButton )
+IMPL_LINK_TYPED( AssistentDlgImpl, OpenButtonHdl, Button*, pButton, void )
 {
     // Clear the selection and forward the call.
     mpPage1OpenLB->SetNoSelection();
-    return mpPage1OpenLB->GetDoubleClickHdl().Call(pButton);
+    mpPage1OpenLB->GetDoubleClickHdl().Call(pButton);
 }
 
 IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, EffectPreviewIdleHdl, Idle *, void)
@@ -1134,15 +1134,13 @@ IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewClickHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, PreviewFlagHdl)
-
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PreviewFlagHdl, Button*, void)
 {
     if( mpPreviewFlag->IsChecked() != mbPreview )
     {
         mbPreview = mpPreviewFlag->IsChecked();
         UpdatePreview(true);
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(AssistentDlgImpl, SelectTemplateHdl)
@@ -1189,9 +1187,9 @@ IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePreviewHdl, Idle *, void)
     UpdatePreview( true );
 }
 
-IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton )
+IMPL_LINK_TYPED( AssistentDlgImpl, StartTypeHdl, Button *, pButton, void )
 {
-    StartType eType = pButton == mpPage1EmptyRB?ST_EMPTY:pButton == mpPage1TemplateRB?ST_TEMPLATE:ST_OPEN;
+    StartType eType = pButton == mpPage1EmptyRB ? ST_EMPTY : pButton == mpPage1TemplateRB ? ST_TEMPLATE:ST_OPEN;
 
     if(eType == ST_TEMPLATE)
         ProvideTemplates();
@@ -1209,10 +1207,9 @@ IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton )
         mpPage1OpenLB->SelectEntryPos(0);
 
     maPrevIdle.Start();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, NextPageHdl, Button*, void)
 {
     // When changing from the first to the second page make sure that the
     // templates are present.
@@ -1223,18 +1220,16 @@ IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl)
     LeavePage();
     maAssistentFunc.NextPage();
     ChangePage();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, LastPageHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, LastPageHdl, Button*, void)
 {
     LeavePage();
     maAssistentFunc.PreviousPage();
     ChangePage();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PresTypeHdl, Button*, void)
 {
     if (maDocFile.isEmpty())
     {
@@ -1247,7 +1242,6 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl)
     mpPage3PresTimeTMF->Enable(bKiosk);
     mpPage3BreakTMF->Enable(bKiosk);
     mpPage3LogoCB->Enable(bKiosk);
-    return 0;
 }
 
 IMPL_LINK_NOARG(AssistentDlgImpl, UpdateUserDataHdl)
@@ -1728,14 +1722,18 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL)
 AssistentDlg::AssistentDlg(vcl::Window* pParent, bool bAutoPilot) :
     ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui")
 {
-    Link<> aFinishLink = LINK(this,AssistentDlg, FinishHdl);
-    mpImpl = new AssistentDlgImpl( this, aFinishLink, bAutoPilot );
+    mpImpl = new AssistentDlgImpl( this, LINK(this,AssistentDlg, FinishHdl2), bAutoPilot );
 
     // button assignment
     mpImpl->mpFinishButton->SetClickHdl(LINK(this,AssistentDlg,FinishHdl));
 }
 
-IMPL_LINK_NOARG(AssistentDlg, FinishHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlg, FinishHdl, Button*, void)
+{
+    FinishHdl2(NULL);
+}
+
+IMPL_LINK_NOARG(AssistentDlg, FinishHdl2)
 {
     if( GetStartType() == ST_OPEN )
     {
@@ -1865,7 +1863,7 @@ void NextButton::ForceFocusEventBroadcast()
     }
 }
 
-void NextButton::SetClickHdl (const Link<>& rLink)
+void NextButton::SetClickHdl (const Link<Button*,void>& rLink)
 {
     // Forward the setting of the click handler to the two buttons
     // regardless of which one is currently visible.
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index aed2a1059f4a..61c190586adf 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -133,14 +133,12 @@ void SdSnapLineDlg::dispose()
 /**
  * fills provided item sets with dialog box attributes
  */
-IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn )
+IMPL_LINK_TYPED( SdSnapLineDlg, ClickHdl, Button *, pBtn, void )
 {
     if ( pBtn == m_pRbPoint )        SetInputFields(true, true);
     else if ( pBtn == m_pRbHorz )    SetInputFields(false, true);
     else if ( pBtn == m_pRbVert )    SetInputFields(true, false);
     else if ( pBtn == m_pBtnDelete ) EndDialog(RET_SNAP_DELETE);
-
-    return 0;
 }
 
 /**
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6cd66862d7d3..79ce991a6dbd 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -145,7 +145,7 @@ private:
 
     bool            mbHandoutMode;
 
-    DECL_LINK( UpdateOnClickHdl, void * );
+    DECL_LINK_TYPED( UpdateOnClickHdl, Button*, void );
 
     DECL_LINK( LanguageChangeHdl, void * );
 
@@ -266,22 +266,19 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void)
 {
     ApplyToAll();
-    return 0;
 }
 
-IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyHdl, Button*, void)
 {
     Apply();
-    return 0;
 }
 
-IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickCancelHdl, Button*, void)
 {
     Cancel();
-    return 0;
 }
 
 short HeaderFooterDialog::Execute()
@@ -588,11 +585,9 @@ void HeaderFooterTabPage::update()
     mpCTPreview->update( aSettings );
 }
 
-IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void)
 {
     update();
-
-    return 0;
 }
 
 void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet )
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 29bc961a7e41..79538044e5cd 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -53,7 +53,7 @@ private:
     VclPtr<NumericField>    m_pNewStartNF;
     bool             mbModified;
 
-    DECL_LINK( ImplNewStartHdl, void* );
+    DECL_LINK_TYPED( ImplNewStartHdl, Button*, void );
 };
 
 SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr )
@@ -155,12 +155,11 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     mbModified = false;
 }
 
-IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl)
+IMPL_LINK_NOARG_TYPED(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void)
 {
     bool bEnable = m_pNewStartCB->IsChecked();
     m_pNewStartNumberCB->Enable(bEnable);
     m_pNewStartNF->Enable(bEnable && m_pNewStartNumberCB->IsChecked());
-    return 0;
 }
 
 SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr )
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 8809295caed3..7891916a5e53 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -72,7 +72,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow,
     get( msMonitor,             "monitor_str"           );
     get( msAllMonitors,         "allmonitors_str"       );
 
-    Link<> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
+    Link<Button*,void> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
 
     aRbtAll->SetClickHdl( aLink );
     aRbtAtDia->SetClickHdl( aLink );
@@ -144,7 +144,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow,
 
     InitMonitorSettings();
 
-    ChangeRangeHdl( this );
+    ChangeRangeHdl( NULL );
 
     ClickWindowPresentationHdl( NULL );
     ChangePauseHdl( NULL );
@@ -322,18 +322,16 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
 /**
  *      Handler: Enabled/Disabled Listbox "Dias"
  */
-IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl)
+IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void)
 {
     aLbDias->Enable( aRbtAtDia->IsChecked() );
     aLbCustomshow->Enable( aRbtCustomshow->IsChecked() );
-
-    return 0L;
 }
 
 /**
  *      Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
  */
-IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
+IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void)
 {
     const bool bAuto = aRbtAuto->IsChecked();
     const bool bWindow = aRbtWindow->IsChecked();
@@ -353,8 +351,6 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl)
     }
     else
         aCbxAlwaysOnTop->Enable();
-
-    return 0L;
 }
 
 /**
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 2b44f51b3599..0585682cd3b5 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -52,7 +52,7 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs
     get( m_pCbxBack , "backcb" );
     get( m_pCbxPaperbin , "papertryfrmprntrcb" );
 
-    Link<> aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
+    Link<Button*,void> aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
     m_pRbtDefault->SetClickHdl( aLink );
     m_pRbtPagesize->SetClickHdl( aLink );
     m_pRbtPagetile->SetClickHdl( aLink );
@@ -213,20 +213,18 @@ VclPtr<SfxTabPage> SdPrintOptions::Create( vcl::Window* pWindow,
     return VclPtr<SdPrintOptions>::Create( pWindow, *rOutAttrs );
 }
 
-IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
+IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void )
 {
     // there must be at least one of them checked
     if( !m_pCbxDraw->IsChecked() && !m_pCbxNotes->IsChecked() && !m_pCbxOutline->IsChecked() && !m_pCbxHandout->IsChecked() )
-        pCbx->Check();
+        static_cast<CheckBox*>(pCbx)->Check();
 
     updateControls();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl)
+IMPL_LINK_NOARG_TYPED(SdPrintOptions, ClickBookletHdl, Button*, void)
 {
     updateControls();
-    return 0;
 }
 
 void SdPrintOptions::updateControls()
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 51206936dd07..86e742a38456 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -177,13 +177,13 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl)
 /**
  * Click handler for load button
  */
-IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
+IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
 {
     VclPtrInstance< SfxNewFileDialog > pDlg(this, SFXWB_PREVIEW);
     pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
 
     if(!IsReallyVisible())
-        return 0;
+        return;
 
     sal_uInt16 nResult = pDlg->Execute();
     // Inserted update to force repaint
@@ -283,8 +283,6 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
             }
         }
     }
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 81a711452cae..e8d36f946f16 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -472,11 +472,9 @@ void SdTPAction::OpenFileDialog()
     }
 }
 
-IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl)
+IMPL_LINK_NOARG_TYPED(SdTPAction, ClickSearchHdl, Button*, void)
 {
     OpenFileDialog();
-
-    return 0L;
 }
 
 IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 1865ac53f17f..ffcdbe2c1232 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -266,24 +266,20 @@ IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData )
     return 0L;
 }
 
-IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl)
+IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickPreviewHdl, Button*, void)
 {
     Calculate( aBmp, aMtf );
     m_pMtfWin->SetGraphic( aMtf );
     m_pBtnPreview->Disable();
-
-    return 0L;
 }
 
-IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl)
+IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void)
 {
     if( m_pBtnPreview->IsEnabled() )
         Calculate( aBmp, aMtf );
 
     SaveSettings();
     EndDialog( RET_OK );
-
-    return 0L;
 }
 
 IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb )
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 2a807a7870d3..b53745300552 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -72,7 +72,7 @@ private:
     Link<>          aLink;
     SfxProgress     *mpProgress;
 
-    DECL_LINK( CancelButtonHdl, void* );
+    DECL_LINK_TYPED( CancelButtonHdl, Button*, void );
     DECL_LINK( UpDate, void* );
     DECL_LINK_TYPED( InitialUpdate, Idle*, void );
 };
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 4a02d194040f..11d69d3a8a4f 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -133,14 +133,14 @@ private:
 
     ScopeLock       maPlayLock;
 
-    DECL_LINK( ClickFirstHdl, void * );
-    DECL_LINK( ClickStopHdl, void * );
-    DECL_LINK( ClickPlayHdl, void * );
-    DECL_LINK( ClickLastHdl, void * );
-    DECL_LINK( ClickGetObjectHdl, void * );
-    DECL_LINK( ClickRemoveBitmapHdl, void * );
-    DECL_LINK( ClickRbtHdl, void * );
-    DECL_LINK( ClickCreateGroupHdl, void * );
+    DECL_LINK_TYPED( ClickFirstHdl, Button*, void );
+    DECL_LINK_TYPED( ClickStopHdl, Button*, void );
+    DECL_LINK_TYPED( ClickPlayHdl, Button*, void );
+    DECL_LINK_TYPED( ClickLastHdl, Button*, void );
+    DECL_LINK_TYPED( ClickGetObjectHdl, Button*, void );
+    DECL_LINK_TYPED( ClickRemoveBitmapHdl, Button*, void );
+    DECL_LINK_TYPED( ClickRbtHdl, Button*, void );
+    DECL_LINK_TYPED( ClickCreateGroupHdl, Button*, void );
     DECL_LINK( ModifyBitmapHdl, void * );
     DECL_LINK( ModifyTimeHdl, void * );
 
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 1da44c927a6c..25c0ce4310f4 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -70,8 +70,8 @@ private:
     ::sd::View*         mpView;
 
     DECL_LINK( SelectColorHdl, void * );
-    DECL_LINK( SetViewData, void * );
-    DECL_LINK( SetDefault, void * );
+    DECL_LINK_TYPED( SetViewData, Button*, void );
+    DECL_LINK_TYPED( SetDefault, Button*, void );
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index 4fcbc7d54c75..66cc333f9ca0 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -51,8 +51,9 @@ private:
 
     void            CheckState();
 
-    DECL_LINK( ClickButtonHdl, void * );
-    DECL_LINK( StartShowHdl, void* );
+    DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
+    DECL_LINK( SelectHdl, void* );
+    DECL_LINK_TYPED( StartShowHdl, Button*, void );
 
 public:
                 SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc );
@@ -82,8 +83,9 @@ private:
     void            CheckState();
     void            CheckCustomShow();
 
-    DECL_LINK( ClickButtonHdl, void * );
-    DECL_LINK( OKHdl, void * );
+    DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
+    DECL_LINK( ClickButtonHdl2, void* );
+    DECL_LINK_TYPED( OKHdl, Button*, void );
 
 public:
 
diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx
index b9f9136e2fd3..c3685c22d598 100644
--- a/sd/source/ui/inc/dlgass.hxx
+++ b/sd/source/ui/inc/dlgass.hxx
@@ -45,7 +45,8 @@ public:
     virtual ~AssistentDlg();
     virtual void dispose() SAL_OVERRIDE;
 
-    DECL_LINK( FinishHdl, void * );
+    DECL_LINK_TYPED( FinishHdl, Button*, void );
+    DECL_LINK( FinishHdl2, void* );
 
     SfxObjectShellLock GetDocument();
     OutputType GetOutputMedium() const;
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index f17a7c5c3413..0307fdf377f7 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -55,7 +55,7 @@ private:
     FieldUnit           eUIUnit;
     Fraction            aUIScale;
 
-    DECL_LINK( ClickHdl, Button * );
+    DECL_LINK_TYPED( ClickHdl, Button *, void );
 
 public:
     SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView);
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index a9c34b484577..8a1d4fd5c7f9 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -38,9 +38,9 @@ class HeaderFooterDialog : public TabDialog
 {
 private:
     DECL_LINK( ActivatePageHdl, TabControl * );
-    DECL_LINK( ClickApplyToAllHdl, void * );
-    DECL_LINK( ClickApplyHdl, void * );
-    DECL_LINK( ClickCancelHdl, void * );
+    DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void );
+    DECL_LINK_TYPED( ClickApplyHdl, Button*, void );
+    DECL_LINK_TYPED( ClickCancelHdl, Button*, void );
 
     VclPtr<TabControl>      mpTabCtrl;
 
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 0398823c783d..49b8e9c8093b 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -69,8 +69,8 @@ private:
     VclPtr<FixedText>          msMonitorExternal;
     VclPtr<FixedText>          msExternal;
 
-                        DECL_LINK( ChangeRangeHdl, void * );
-                        DECL_LINK( ClickWindowPresentationHdl, void * );
+                        DECL_LINK_TYPED( ChangeRangeHdl, Button*, void );
+                        DECL_LINK_TYPED( ClickWindowPresentationHdl, Button*, void );
                         DECL_LINK( ChangePauseHdl, void * );
 
     void                InitMonitorSettings();
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 4c013ce36db1..0178891e34b9 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -54,8 +54,8 @@ private:
 
     const SfxItemSet&   rOutAttrs;
 
-    DECL_LINK( ClickCheckboxHdl, CheckBox * );
-    DECL_LINK( ClickBookletHdl, void * );
+    DECL_LINK_TYPED( ClickCheckboxHdl, Button*, void );
+    DECL_LINK_TYPED( ClickBookletHdl, Button*, void );
 
     void updateControls();
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index f9670c7b038f..1514594cae75 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -177,21 +177,21 @@ private:
 
     void    LoadPreviewButtons();
 
-    DECL_LINK( FinishHdl, void * );
-    DECL_LINK( NextPageHdl, void * );
-    DECL_LINK( LastPageHdl, void * );
+    DECL_LINK_TYPED( FinishHdl, Button*, void );
+    DECL_LINK_TYPED( NextPageHdl, Button*, void );
+    DECL_LINK_TYPED( LastPageHdl, Button*, void );
 
-    DECL_LINK( DesignHdl, RadioButton * );
+    DECL_LINK_TYPED( DesignHdl, Button*, void );
     DECL_LINK( DesignSelectHdl, void * );
-    DECL_LINK( DesignDeleteHdl, void * );
-    DECL_LINK( BaseHdl, void * );
-    DECL_LINK( ContentHdl, void * );
-    DECL_LINK( GfxFormatHdl, RadioButton * );
-    DECL_LINK( ResolutionHdl, RadioButton * );
+    DECL_LINK_TYPED( DesignDeleteHdl, Button*, void );
+    DECL_LINK_TYPED( BaseHdl, Button*, void );
+    DECL_LINK_TYPED( ContentHdl, Button*, void );
+    DECL_LINK_TYPED( GfxFormatHdl, Button *, void );
+    DECL_LINK_TYPED( ResolutionHdl, Button*, void );
     DECL_LINK( ButtonsHdl, void * );
-    DECL_LINK( ColorHdl, PushButton * );
-    DECL_LINK( WebServerHdl, RadioButton * );
-    DECL_LINK( SlideChgHdl, void * );
+    DECL_LINK_TYPED( ColorHdl, Button*, void );
+    DECL_LINK_TYPED( WebServerHdl, Button *, void );
+    DECL_LINK_TYPED( SlideChgHdl, Button*, void );
 
 public:
 
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 69093c624a8c..2c88259dc8e7 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -47,7 +47,7 @@ public:
     void                GetAttr(SfxItemSet& rOutAttrs);
 
     DECL_LINK(ClickLayoutHdl, void *);
-    DECL_LINK(ClickLoadHdl, void *);
+    DECL_LINK_TYPED(ClickLoadHdl, Button*, void);
 
 private:
     ::sd::DrawDocShell* mpDocSh;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 09ebf54a72e0..931ed2d664b0 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -79,7 +79,7 @@ private:
     OUString                aLastFile;
     ::std::vector< long >   aVerbVector;
 
-    DECL_LINK( ClickSearchHdl, void * );
+    DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
     DECL_LINK( ClickActionHdl, void * );
     DECL_LINK( SelectTreeHdl, void * );
     DECL_LINK( CheckFileHdl, void * );
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index d76b66fa6588..3c9a75810987 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -73,8 +73,8 @@ class SdVectorizeDlg : public ModalDialog
                                  long nPosX, long nPosY, long nWidth, long nHeight );
 
                         DECL_LINK( ProgressHdl, void* );
-                        DECL_LINK( ClickPreviewHdl, void* );
-                        DECL_LINK( ClickOKHdl, void* );
+                        DECL_LINK_TYPED( ClickPreviewHdl, Button*, void );
+                        DECL_LINK_TYPED( ClickOKHdl, Button*, void );
                         DECL_LINK( ToggleHdl, CheckBox* );
                         DECL_LINK( ModifyHdl, void* );
 
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 206a08bb0993..910aa9e44f54 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -218,7 +218,7 @@ void TableDesignWidget::ApplyStyle()
     }
 }
 
-IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl)
+IMPL_LINK_NOARG_TYPED(TableDesignWidget, implCheckBoxHdl, Button*, void)
 {
     mbOptionsChanged = true;
 
@@ -226,7 +226,6 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl)
         ApplyOptions();
 
     FillDesignPreviewControl();
-    return 0;
 }
 
 void TableDesignWidget::ApplyOptions()
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index ecf324078546..64fb0070d23a 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -87,7 +87,7 @@ private:
 
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
     DECL_LINK(implValueSetHdl, void *);
-    DECL_LINK(implCheckBoxHdl, void *);
+    DECL_LINK_TYPED(implCheckBoxHdl, Button*, void);
 
 private:
     ViewShellBase& mrBase;