convert Link<> to typed

Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 10 insertions, 16 deletions

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 9ee6d15536b9..4a9f910cc3d8 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -367,7 +367,7 @@ short RemoteFilesDialog::Execute()
     if( m_pServices_lb->GetEntryCount() > 0 )
     {
         Show();
-        SelectServiceHdl( NULL );
+        SelectServiceHdl( *m_pServices_lb );
     }
     if( !m_bIsConnected )
     {
@@ -749,7 +749,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void )
             m_pServices_lb->InsertEntry( sPrefix + newService->GetName() );
             m_pServices_lb->SelectEntryPos( m_pServices_lb->GetEntryCount() - 1 );
             m_pAddService_btn->SetPopupMenu( m_pAddMenu );
-            SelectServiceHdl( NULL );
+            SelectServiceHdl( *m_pServices_lb );
 
             m_bIsUpdated = true;
 
@@ -763,7 +763,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void )
     };
 }
 
-IMPL_LINK_NOARG ( RemoteFilesDialog, SelectServiceHdl )
+IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectServiceHdl, ListBox&, void )
 {
     int nPos = GetSelectedServicePos();
 
@@ -775,8 +775,6 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectServiceHdl )
         m_bServiceChanged = true;
         OpenURL( sURL );
     }
-
-    return 1;
 }
 
 IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void )
@@ -1020,7 +1018,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SplitHdl, Splitter*, void )
     m_pSplitter->SetPosPixel( Point( placeSize.Width(), m_pSplitter->GetPosPixel().Y() ) );
 }
 
-IMPL_LINK_NOARG ( RemoteFilesDialog, SelectFilterHdl )
+IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectFilterHdl, ListBox&, void )
 {
     unsigned int nPos = m_pFilter_lb->GetSelectEntryPos();
 
@@ -1033,8 +1031,6 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectFilterHdl )
         if( !sCurrentURL.isEmpty() && m_bIsConnected )
             OpenURL( sCurrentURL );
     }
-
-    return 1;
 }
 
 IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void )
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 78488cc15a5c..1e54c413cf2f 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -186,7 +186,7 @@ private:
                     , const OUString& rPassword, bool bPersistent );
 
     DECL_LINK_TYPED ( AddServiceHdl, Button*, void );
-    DECL_LINK ( SelectServiceHdl, void * );
+    DECL_LINK_TYPED ( SelectServiceHdl, ListBox&, void );
     DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void );
 
     DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool );
@@ -197,7 +197,7 @@ private:
 
     DECL_LINK_TYPED( SplitHdl, Splitter*, void );
 
-    DECL_LINK( SelectFilterHdl, void * );
+    DECL_LINK_TYPED( SelectFilterHdl, ListBox&, void );
 
     DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void );
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index d2714b466ce1..d99b36d02bfd 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1232,7 +1232,7 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable )
 
 
 
-IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
+IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void )
 {
     OUString sSelectedFilterDisplayName;
     SvtFileDialogFilter_Impl* pSelectedFilter = _pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName );
@@ -1302,8 +1302,6 @@ IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl )
             }
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void)
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 19b5d8ab0e2e..98d66c6232c5 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -84,7 +84,7 @@ private:
     bool                        m_bHasFilename;
     ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_context;
 
-    DECL_LINK( FilterSelectHdl_Impl, void* );
+    DECL_LINK_TYPED(            FilterSelectHdl_Impl, ListBox&, void );
     DECL_LINK_TYPED(            FilterSelectTimerHdl_Impl, Timer*, void );
     DECL_LINK_TYPED(            NewFolderHdl_Impl, Button*, void );
     DECL_LINK_TYPED(            OpenUrlHdl_Impl, SvtURLBox*, void );
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 69d6399deab6..feca69663bb0 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -197,7 +197,7 @@ public:
     // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself
             Control*        GetFilterListControl()          { return _pLbFilter; }
             const Control*  GetFilterListControl() const    { return _pLbFilter; }
-    inline  void            SetFilterListSelectHdl( const Link<>& _rHandler );
+    inline  void            SetFilterListSelectHdl( const Link<ListBox&,void>& _rHandler );
 
     // inits the listbox for the filters from the filter list (_pFilter)
             void            ClearFilterList( );
@@ -217,7 +217,7 @@ public:
                 void                                SetCurFilter( SvtFileDialogFilter_Impl* _pFilter, const OUString& _rDisplayName );
 };
 
-inline void SvtExpFileDlg_Impl::SetFilterListSelectHdl( const Link<>& _rHandler )
+inline void SvtExpFileDlg_Impl::SetFilterListSelectHdl( const Link<ListBox&,void>& _rHandler )
 {
     _pLbFilter->SetSelectHdl( _rHandler );
 }