2 files changed, 8 insertions, 11 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 3b2f042745de..08692cce8ff1 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1609,19 +1609,18 @@ void VclExpander::StateChanged(StateChangedType nType)
     }
 }
 
-IMPL_LINK( VclExpander, ClickHdl, DisclosureButton*, pBtn )
+IMPL_LINK_TYPED( VclExpander, ClickHdl, CheckBox&, rBtn, void )
 {
     vcl::Window *pChild = get_child();
     if (pChild)
     {
-        pChild->Show(pBtn->IsChecked());
+        pChild->Show(rBtn.IsChecked());
         queue_resize();
         Dialog* pResizeDialog = m_bResizeTopLevel ? GetParentDialog() : NULL;
         if (pResizeDialog)
             pResizeDialog->setOptimalLayoutSize();
     }
     maExpandedHdl.Call(this);
-    return 0;
 }
 
 VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle)
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 37fbfdc0c9b5..2c81a2ac7167 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1551,10 +1551,9 @@ IMPL_LINK_TYPED( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void )
     ClickHdl(static_cast<Button*>(&rButton));
 }
 
-IMPL_LINK( PrintDialog, ToggleHdl, void*, pButton )
+IMPL_LINK_TYPED( PrintDialog, ToggleHdl, CheckBox&, rButton, void )
 {
-    ClickHdl(static_cast<Button*>(pButton));
-    return 0;
+    ClickHdl(&rButton);
 }
 
 IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
@@ -1761,14 +1760,14 @@ void PrintDialog::makeEnabled( vcl::Window* i_pWindow )
     }
 }
 
-IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox*, i_pBox )
+IMPL_LINK_TYPED( PrintDialog, UIOption_CheckHdl, CheckBox&, i_rBox, void )
 {
-    PropertyValue* pVal = getValueForWindow( i_pBox );
+    PropertyValue* pVal = getValueForWindow( &i_rBox );
     if( pVal )
     {
-        makeEnabled( i_pBox );
+        makeEnabled( &i_rBox );
 
-        bool bVal = i_pBox->IsChecked();
+        bool bVal = i_rBox.IsChecked();
         pVal->Value <<= bVal;
 
         checkOptionalControlDependencies();
@@ -1776,7 +1775,6 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox*, i_pBox )
         // update preview and page settings
         preparePreview();
     }
-    return 0;
 }
 
 IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void )