6 files changed, 9 insertions, 11 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index a2ac1c8ff42b..7e4df5ad458c 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -217,16 +217,15 @@ void SvtFilePicker::prepareExecute()
 }
 
 
-IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )
+IMPL_LINK_TYPED( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void )
 {
     if ( m_xDlgClosedListener.is() )
     {
-        sal_Int16 nRet = static_cast< sal_Int16 >( pDlg->GetResult() );
+        sal_Int16 nRet = static_cast< sal_Int16 >( rDlg.GetResult() );
         css::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
         m_xDlgClosedListener->dialogClosed( aEvent );
         m_xDlgClosedListener.clear();
     }
-    return 0;
 }
 
 
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 78032c162fa0..dbf66e20c233 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -223,7 +223,7 @@ protected:
 
     void                prepareExecute( );
 
-    DECL_LINK(          DialogClosedHdl, Dialog* );
+    DECL_LINK_TYPED(    DialogClosedHdl, Dialog&, void );
 };
 
 // SvtRemoteFilePicker
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 28fd1cfb610f..f3cdafb33957 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -98,17 +98,16 @@ void SvtFolderPicker::prepareExecute()
     }
 }
 
-IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog*, pDlg )
+IMPL_LINK_TYPED( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void )
 {
     if ( m_xListener.is() )
     {
-        sal_Int16 nRet = static_cast< sal_Int16 >( pDlg->GetResult() );
+        sal_Int16 nRet = static_cast< sal_Int16 >( rDlg.GetResult() );
         css::ui::dialogs::DialogClosedEvent aEvent( *this, nRet );
         m_xListener->dialogClosed( aEvent );
         m_xListener.clear();
     }
-    return 0;
-  }
+}
 
 void SAL_CALL SvtFolderPicker::setDisplayDirectory( const OUString& aDirectory )
     throw( IllegalArgumentException, RuntimeException, std::exception )
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 11175fc23efe..2452aa6024bc 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -46,7 +46,7 @@ private:
                             m_xListener;
 
     void                            prepareExecute( );
-    DECL_LINK(                      DialogClosedHdl, Dialog* );
+    DECL_LINK_TYPED(                DialogClosedHdl, Dialog&, void );
 
 public:
                                     SvtFolderPicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index c3186704222d..ed34f46a2831 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1804,7 +1804,7 @@ short SvtFileDialog::Execute()
 }
 
 
-void SvtFileDialog::StartExecuteModal( const Link<>& rEndDialogHdl )
+void SvtFileDialog::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
 {
     PrepareExecute();
 
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 1f02d690a65d..f7cf813c0a3e 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -167,7 +167,7 @@ public:
     virtual void                dispose() override;
 
     virtual short               Execute() override;
-    virtual void                StartExecuteModal( const Link<>& rEndDialogHdl ) override;
+    virtual void                StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override;
 
             void                FileSelect();
             void                FilterSelect() override;