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

Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b

5 files changed, 28 insertions, 24 deletions

diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 145b02f2df1d..9c02cf943922 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -211,7 +211,7 @@ void ButtonDialog::ImplPosControls()
     mbFormat = false;
 }
 
-IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn )
+IMPL_LINK_TYPED( ButtonDialog, ImplClickHdl, Button*, pBtn, void )
 {
     for (auto & it : m_ItemList)
     {
@@ -222,8 +222,6 @@ IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn )
             break;
         }
     }
-
-    return 0;
 }
 
 void ButtonDialog::Resize()
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 090a70c9e570..ddc3a7a5c73b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2053,10 +2053,9 @@ void MessageDialog::response(short nResponseId)
     EndDialog(nResponseId);
 }
 
-IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton)
+IMPL_LINK_TYPED(MessageDialog, ButtonHdl, Button *, pButton, void)
 {
     response(get_response(pButton));
-    return 0;
 }
 
 short MessageDialog::get_response(const vcl::Window *pWindow) const
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 2fcc536d09df..3a346827d7b9 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -289,14 +289,16 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent )
     return 0;
 }
 
-IMPL_LINK_NOARG(MenuBarWindow, FloatHdl)
+IMPL_LINK_NOARG_TYPED(MenuBarWindow, FloatHdl, Button*, void)
 {
-    return pMenu ? static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0;
+    if (pMenu)
+        static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu );
 }
 
-IMPL_LINK_NOARG(MenuBarWindow, HideHdl)
+IMPL_LINK_NOARG_TYPED(MenuBarWindow, HideHdl, Button*, void)
 {
-    return pMenu ? static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0;
+    if (pMenu)
+        static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu );
 }
 
 void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst )
diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx
index 579e03b687f1..269651d6b12f 100644
--- a/vcl/source/window/menubarwindow.hxx
+++ b/vcl/source/window/menubarwindow.hxx
@@ -27,6 +27,8 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/window.hxx>
 
+class Button;
+
 /** Toolbox that holds the close button (right hand side of the menubar).
 
 This is also used by the online update check; when an update is available, it
@@ -101,9 +103,9 @@ private:
 
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
-    DECL_LINK_TYPED(CloseHdl, ToolBox *, void);
-    DECL_LINK(FloatHdl, void *);
-    DECL_LINK(HideHdl, void *);
+    DECL_LINK_TYPED(CloseHdl, ToolBox*, void);
+    DECL_LINK_TYPED(FloatHdl, Button*, void);
+    DECL_LINK_TYPED(HideHdl, Button*, void);
     DECL_LINK( ToolboxEventHdl, VclWindowEvent* );
     DECL_LINK( ShowHideListener, VclWindowEvent* );
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 05db2cf5bf87..c7995ac3c90e 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -673,14 +673,14 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
     mpForwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
     mpBackwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
 
-    maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     maJobPage.mpSetupButton->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
     maNUpPage.mpBorderCB->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+    maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+    maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+    maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
+    maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     // setup modify hdl
     mpPageEdit->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
     maJobPage.mpCopyCountField->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
@@ -1006,7 +1006,7 @@ void PrintDialog::setupOptionalUI()
                 pVal->Value >>= bVal;
             maNUpPage.mpBrochureBtn->Check( bVal );
             maNUpPage.mpBrochureBtn->Enable( maPController->isUIOptionEnabled( aPropertyName ) && pVal != NULL );
-            maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+            maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
 
             maPropertyToWindowMap[ aPropertyName ].push_back( maNUpPage.mpBrochureBtn );
             maControlToPropertyMap[maNUpPage.mpBrochureBtn] = aPropertyName;
@@ -1546,7 +1546,13 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox )
     return 0;
 }
 
-IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
+IMPL_LINK( PrintDialog, ToggleHdl, void*, pButton )
+{
+    ClickHdl(static_cast<Button*>(pButton));
+    return 0;
+}
+
+IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
 {
     if( pButton == mpOKButton || pButton == mpCancelButton )
     {
@@ -1639,7 +1645,6 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
         }
         checkControlDependencies();
     }
-    return 0;
 }
 
 IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit )
@@ -1932,12 +1937,10 @@ void PrintProgressDialog::dispose()
     ModelessDialog::dispose();
 }
 
-IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton )
+IMPL_LINK_TYPED( PrintProgressDialog, ClickHdl, Button*, pButton, void )
 {
     if( pButton == mpButton )
         mbCanceled = true;
-
-    return 0;
 }
 
 void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )