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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

2 files changed, 24 insertions, 41 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 968d12e70664..ec94f62ce7a5 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -62,7 +62,7 @@ class SmPrintOptionsTabPage : public SfxTabPage
     VclPtr<CheckBox>       m_pNoRightSpaces;
     VclPtr<CheckBox>       m_pSaveOnlyUsedSymbols;
 
-    DECL_LINK(SizeButtonClickHdl, Button *);
+    DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void);
 
     virtual bool    FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
     virtual void    Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
@@ -104,7 +104,7 @@ class SmFontDialog : public ModalDialog
 
     DECL_LINK(FontSelectHdl, ComboBox *);
     DECL_LINK(FontModifyHdl, ComboBox *);
-    DECL_LINK(AttrChangeHdl, CheckBox *);
+    DECL_LINK_TYPED(AttrChangeHdl, Button *, void);
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
@@ -132,7 +132,7 @@ class SmFontSizeDialog : public ModalDialog
     VclPtr<MetricField> m_pBorderSize;
     VclPtr<PushButton> m_pDefaultButton;
 
-    DECL_LINK(DefaultButtonClickHdl, Button *);
+    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmFontSizeDialog(vcl::Window *pParent);
@@ -160,7 +160,7 @@ class SmFontTypeDialog : public ModalDialog
     VclPtr<OutputDevice> pFontListDev;
 
     DECL_LINK(MenuSelectHdl, Menu *);
-    DECL_LINK(DefaultButtonClickHdl, Button *);
+    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice);
@@ -224,8 +224,8 @@ class SmDistanceDialog : public ModalDialog
 
     DECL_LINK(GetFocusHdl, Control *);
     DECL_LINK(MenuSelectHdl, Menu *);
-    DECL_LINK(DefaultButtonClickHdl, Button *);
-    DECL_LINK(CheckBoxClickHdl, CheckBox *);
+    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
+    DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void);
 
     using   Window::SetHelpId;
     static void SetHelpId(MetricField &rField, const OString& sHelpId);
@@ -254,7 +254,7 @@ class SmAlignDialog : public ModalDialog
     VclPtr<RadioButton> m_pRight;
     VclPtr<PushButton>  m_pDefaultButton;
 
-    DECL_LINK(DefaultButtonClickHdl, Button *);
+    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmAlignDialog(vcl::Window *pParent);
@@ -367,8 +367,8 @@ class SmSymbolDialog : public ModalDialog
     DECL_LINK(SymbolSetChangeHdl, void*);
     DECL_LINK(SymbolChangeHdl, void*);
     DECL_LINK(SymbolDblClickHdl, void*);
-    DECL_LINK(EditClickHdl, void*);
-    DECL_LINK(GetClickHdl, void*);
+    DECL_LINK_TYPED(EditClickHdl, Button*, void);
+    DECL_LINK_TYPED(GetClickHdl, Button*, void);
 
     void            FillSymbolSets(bool bDeleteText = true);
     const SmSym    *GetSymbol() const;
@@ -439,9 +439,9 @@ class SmSymDefineDialog : public ModalDialog
     DECL_LINK(SubsetChangeHdl, ListBox*);
     DECL_LINK(StyleChangeHdl, ComboBox *);
     DECL_LINK(CharHighlightHdl, void *);
-    DECL_LINK(AddClickHdl, Button *);
-    DECL_LINK(ChangeClickHdl, Button *);
-    DECL_LINK(DeleteClickHdl, Button *);
+    DECL_LINK_TYPED(AddClickHdl, Button *, void);
+    DECL_LINK_TYPED(ChangeClickHdl, Button *, void);
+    DECL_LINK_TYPED(DeleteClickHdl, Button *, void);
 
     void    FillSymbols(ComboBox &rComboBox, bool bDeleteText = true);
     void    FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b0503f5f046b..57ab5bae7754 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -159,10 +159,9 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
     rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL);
 }
 
-IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,/*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
 {
     m_pZoom->Enable(m_pSizeZoomed->IsChecked());
-    return 0;
 }
 
 SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rOptions)
@@ -314,7 +313,7 @@ IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
     return 0;
 }
 
-IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ )
+IMPL_LINK_NOARG_TYPED( SmFontDialog, AttrChangeHdl, Button*, void )
 {
     if (m_pBoldCheckBox->IsChecked())
         maFont.SetWeight(FontWeight(WEIGHT_BOLD));
@@ -327,7 +326,6 @@ IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ )
         maFont.SetItalic(ITALIC_NONE);
 
     m_pShowFont->SetFont(maFont);
-    return 0;
 }
 
 void SmFontDialog::SetFont(const vcl::Font &rFont)
@@ -420,7 +418,7 @@ public:
     }
 };
 
-IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES)
     {
@@ -429,7 +427,6 @@ IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
         WriteTo( aFmt );
         pp->GetConfig()->SetStandardFormat( aFmt );
     }
-    return 0;
 }
 
 SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent)
@@ -524,7 +521,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES)
     {
@@ -533,7 +530,6 @@ IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
         WriteTo( aFmt );
         pp->GetConfig()->SetStandardFormat( aFmt, true );
     }
-    return 0;
 }
 
 SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice)
@@ -721,7 +717,7 @@ IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu )
 }
 
 
-IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES)
     {
@@ -730,10 +726,9 @@ IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
         WriteTo( aFmt );
         pp->GetConfig()->SetStandardFormat( aFmt );
     }
-    return 0;
 }
 
-IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
+IMPL_LINK_TYPED( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void )
 {
     if (pCheckBox == m_pCheckBox1)
     {
@@ -743,7 +738,6 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
         m_pFixedText4->Enable( bChecked );
         m_pMetricField4->Enable( bChecked );
     }
-    return 0;
 }
 
 
@@ -1027,7 +1021,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
+IMPL_LINK_NOARG_TYPED( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES)
     {
@@ -1036,7 +1030,6 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ )
         WriteTo( aFmt );
         pp->GetConfig()->SetStandardFormat( aFmt );
     }
-    return 0;
 }
 
 SmAlignDialog::SmAlignDialog(vcl::Window * pParent)
@@ -1472,7 +1465,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl )
     return 0;
 }
 
-IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl)
+IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
 {
     ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr);
 
@@ -1510,8 +1503,6 @@ IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl)
     if (nSymPos >= aSymbolSet.size())
         nSymPos = static_cast< sal_uInt16 >(aSymbolSet.size()) - 1;
     SelectSymbol( nSymPos );
-
-    return 0;
 }
 
 
@@ -1523,7 +1514,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl )
 }
 
 
-IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl )
+IMPL_LINK_NOARG_TYPED( SmSymbolDialog, GetClickHdl, Button*, void )
 {
     const SmSym *pSym = GetSymbol();
     if (pSym)
@@ -1535,8 +1526,6 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl )
                 SID_INSERTSYMBOL, SfxCallMode::RECORD,
                 new SfxStringItem(SID_INSERTSYMBOL, aText.makeStringAndClear()), 0L);
     }
-
-    return 0;
 }
 
 
@@ -1922,7 +1911,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -1948,12 +1937,10 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton )
     FillSymbols(*pSymbols    ,false);
 
     UpdateButtons();
-
-    return 0;
 }
 
 
-IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -1989,12 +1976,10 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton )
     FillSymbols(*pSymbols    ,false);
 
     UpdateButtons();
-
-    return 0;
 }
 
 
-IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton )
+IMPL_LINK_TYPED( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void )
 {
     (void) pButton;
 #if OSL_DEBUG_LEVEL > 1
@@ -2017,8 +2002,6 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton )
     }
 
     UpdateButtons();
-
-    return 0;
 }