From 61623d5b90510ae6c791a41031d586a9316e74c4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 7 Sep 2015 09:35:04 +0200
Subject: convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
---
 sd/source/ui/dlg/custsdlg.cxx | 6 +++++-
 sd/source/ui/dlg/dlgass.cxx   | 6 ++----
 sd/source/ui/dlg/dlgassim.cxx | 6 ++----
 sd/source/ui/dlg/dlgassim.hxx | 2 +-
 sd/source/ui/dlg/inspagob.cxx | 4 +---
 sd/source/ui/dlg/tpaction.cxx | 3 +--
 6 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'sd/source/ui/dlg')

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 47a139645938..bfa142d5afcb 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -300,7 +300,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
     m_pBtnRemove->SetClickHdl( aLink );
     m_pEdtName->SetModifyHdl( aLink2 );
     m_pLbPages->SetSelectHdl( aLink2 ); // because of status
-    m_pLbCustomPages->SetSelectHdl( aLink2 ); // because of status
+    m_pLbCustomPages->SetSelectHdl( LINK( this, SdDefineCustomShowDlg, ClickButtonHdl3 ) ); // because of status
 
     m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
 
@@ -387,6 +387,10 @@ IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void )
 {
     ClickButtonHdl2(p);
 }
+IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void )
+{
+    ClickButtonHdl2(p);
+}
 // ButtonHdl()
 IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl2, void *, p )
 {
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 2f67a4d46861..5c848a1858fd 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -237,7 +237,7 @@ public:
     DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void );
     DECL_LINK( EffectPreviewClickHdl, void * );
     DECL_LINK( SelectLayoutHdl, void * );
-    DECL_LINK( PageSelectHdl, void * );
+    DECL_LINK_TYPED( PageSelectHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED( PresTypeHdl, Button*, void );
     DECL_LINK( UpdateUserDataHdl, void * );
     DECL_LINK( SelectEffectHdl, void* );
@@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, SelectFileHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PageSelectHdl, SvTreeListBox*, void)
 {
     sal_uInt16 nPage = mpPage5PageListCT->GetSelectedPage();
     if( mnShowPage != nPage )
@@ -1173,8 +1173,6 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl)
         mnShowPage = nPage;
         UpdatePreview(false);
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePageListHdl, Idle *, void)
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index ffc77b863187..20a3dea9ccf4 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -58,7 +58,7 @@ VCL_BUILDER_DECL_FACTORY(SdPageListControl)
     rRet = VclPtr<SdPageListControl>::Create(pParent, nWinStyle);
 }
 
-IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
+IMPL_LINK_NOARG_TYPED(SdPageListControl, CheckButtonClickHdl, SvTreeListBox*, void)
 {
     SvTreeList* pTreeModel = GetModel();
     SvTreeListEntry* pEntry = pTreeModel->First();
@@ -66,14 +66,12 @@ IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
     while( pEntry )
     {
         if(pTreeModel->IsAtRootDepth(pEntry) && GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
-            return 0;
+            return;
         pEntry = pTreeModel->Next( pEntry );
     }
 
     pEntry = pTreeModel->First();
     SetCheckButtonState( pEntry, SV_BUTTON_CHECKED );
-
-    return 0;
 }
 
 SdPageListControl::~SdPageListControl()
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index ee39788cb136..69c8642abb2e 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -45,7 +45,7 @@ public:
     sal_uInt16 GetSelectedPage();
     bool IsPageChecked( sal_uInt16 nPage );
 
-    DECL_LINK( CheckButtonClickHdl, void * );
+    DECL_LINK_TYPED( CheckButtonClickHdl, SvTreeListBox*, void );
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index ed7d6720923e..b0f8bad8e629 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -128,14 +128,12 @@ bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const
 /**
  * Enabled and selects end-color-LB
  */
-IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl)
+IMPL_LINK_NOARG_TYPED(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void)
 {
     if( m_pLbTree->IsLinkableSelected() )
         m_pCbxLink->Enable();
     else
         m_pCbxLink->Disable();
-
-    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 e8d36f946f16..7ed705198b6f 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -651,10 +651,9 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
     return 0L;
 }
 
-IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
+IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
 {
     m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() );
-    return 0L;
 }
 
 IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
-- 
cgit