convert Link<> to typed

Change-Id: I53b0a7a9875a3ebcca915c8f2d8c53face6f9509

6 files changed, 17 insertions, 22 deletions

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 63381478222d..92008bb39f10 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -82,13 +82,13 @@ static long nTabs[] =
 #define LB_MACROS_ITEMPOS    2
 
 
-IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
+IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
 {
     DBG_ASSERT( pBar == maHeaderBar.get(), "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." );
     (void)pBar;
 
     if( !maHeaderBar->GetCurItemId() )
-        return 0;
+        return;
 
     if( !maHeaderBar->IsItemMode() )
     {
@@ -113,7 +113,6 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
             }
         }
     }
-    return 1;
 }
 
 bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 2e0839395b1e..879b6cd765eb 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -59,8 +59,8 @@ namespace svx
 
         DECL_LINK(PathSelect_Impl, void *);
 
-        DECL_LINK( HeaderSelect_Impl, HeaderBar * );
-        DECL_LINK( HeaderEndDrag_Impl, HeaderBar * );
+        DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
+        DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
         DECL_LINK( NameValidator, OUString*);
 
 
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 59037ed1b870..db607ac6c29f 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -30,7 +30,7 @@ private:
     VclPtr<HeaderBar>               maHeaderBar;
     VclPtr<SvHeaderTabListBox>      maListBox;
 protected:
-    DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
+    DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void );
     virtual bool                Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 public:
     MacroEventListBox( vcl::Window* pParent, WinBits nStyle );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 5d23015e74db..384a89ec0e97 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -53,13 +53,13 @@ private:
 
     void        ChangeCurrentEntry( const OUString& _rFolder );
 
-    DECL_LINK_TYPED(PathHdl_Impl, Button*, void);
+    DECL_LINK_TYPED( PathHdl_Impl, Button*, void);
     DECL_LINK(DoubleClickPathHdl_Impl, void *);
-    DECL_LINK_TYPED(StandardHdl_Impl, Button*, void);
+    DECL_LINK_TYPED( StandardHdl_Impl, Button*, void);
 
     DECL_LINK(PathSelect_Impl, void *);
-    DECL_LINK(  HeaderSelect_Impl, HeaderBar * );
-    DECL_LINK(  HeaderEndDrag_Impl, HeaderBar * );
+    DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void );
+    DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void );
 
     DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index eedd4f4b440c..c3e7ccdcc8d3 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -315,12 +315,12 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void)
 
 
 
-IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
+IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void )
 {
     assert(pBar);
 
     if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE)
-        return 0;
+        return;
 
     HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
     bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
@@ -341,17 +341,16 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
     SvTreeList* pModel = m_pPathBox->GetModel();
     pModel->SetSortMode( eMode );
     pModel->Resort();
-    return 1;
 }
 
 
 
-IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
+IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
 {
     assert(pBar);
 
     if (!pBar || !pBar->GetCurItemId())
-        return 0;
+        return;
 
     if ( !pBar->IsItemMode() )
     {
@@ -374,7 +373,6 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
             m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT );
         }
     }
-    return 1;
 }
 
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 787b9564160d..7bddba3e8341 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -634,10 +634,10 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void)
 
 
 
-IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
+IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void )
 {
     if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE)
-        return 0;
+        return;
 
     HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
     bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW );
@@ -658,15 +658,14 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
     SvTreeList* pModel = pPathBox->GetModel();
     pModel->SetSortMode( eMode );
     pModel->Resort();
-    return 1;
 }
 
 
 
-IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
+IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
 {
     if (!pBar || !pBar->GetCurItemId())
-        return 0;
+        return;
 
     if ( !pBar->IsItemMode() )
     {
@@ -689,7 +688,6 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
             pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT );
         }
     }
-    return 1;
 }