make Link<> typed

Change-Id: Ie18b1dda4039b22370a53d0ad8092a4a8b3899d7

cui/source/dialogs/cuigaldlg.cxx

@@ -1274,14 +1274,12 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
 
 
 
-IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt )
+IMPL_LINK_TYPED( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void )
 {
     DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
 
     OUString sURL = xFolderPicker->getDirectory();
     StartSearchFiles( sURL, pEvt->DialogResult );
-
-    return 0L;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/cuigaldlg.hxx

@@ -287,7 +287,7 @@ class TPGalleryThemeProperties : public SfxTabPage
                         DECL_LINK( DClickFoundHdl, void* );
                         DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
                         DECL_LINK(EndSearchProgressHdl, void *);
-                        DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* );
+                        DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
 
 public:
                         TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet );

cui/source/inc/optpath.hxx

@@ -60,7 +60,7 @@ private:
     DECL_LINK(  HeaderSelect_Impl, HeaderBar * );
     DECL_LINK(  HeaderEndDrag_Impl, HeaderBar * );
 
-    DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* );
+    DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
 
     void        GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath,
                              OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly );

cui/source/options/optjava.cxx

@@ -421,7 +421,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
 
 
 
-IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
+IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void )
 {
     if ( RET_OK == pEvt->DialogResult )
     {
@@ -429,7 +429,6 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
 
         AddFolder( xFolderPicker->getDirectory() );
     }
-    return 0L;
 }
 
 

cui/source/options/optjava.hxx

@@ -93,7 +93,7 @@ private:
     DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void);
 
     DECL_LINK(              StartFolderPickerHdl, void * );
-    DECL_LINK(              DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* );
+    DECL_LINK_TYPED(        DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
 
     DECL_LINK(ExpertConfigHdl_Impl, void *);
 

cui/source/options/optpath.cxx

@@ -693,7 +693,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
 
 
 
-IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
+IMPL_LINK_TYPED( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void )
 {
     if ( RET_OK == pEvt->DialogResult )
     {
@@ -702,7 +702,6 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
         OUString sURL = xFolderPicker->getDirectory();
         ChangeCurrentEntry( sURL );
     }
-    return 0L;
 }
 
 

include/svtools/dialogclosedlistener.hxx

@@ -42,16 +42,13 @@ namespace svt
     private:
         /**
             This link will be called when the dialog was closed.
-
-            The link must have the type:
-            DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
         */
-        Link<>  m_aDialogClosedLink;
+        Link<css::ui::dialogs::DialogClosedEvent*, void>  m_aDialogClosedLink;
 
     public:
         DialogClosedListener();
 
-        inline void SetDialogClosedLink( const Link<>& rLink ) { m_aDialogClosedLink = rLink; }
+        inline void SetDialogClosedLink( const Link<css::ui::dialogs::DialogClosedEvent*,void>& rLink ) { m_aDialogClosedLink = rLink; }
 
         // XDialogClosedListener methods
         virtual void SAL_CALL   dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

svtools/source/misc/dialogclosedlistener.cxx

@@ -41,7 +41,7 @@ namespace svt
     {
         if ( m_aDialogClosedLink.IsSet() )
         {
-            ::com::sun::star::ui::dialogs::DialogClosedEvent aEvt( aEvent );
+            css::ui::dialogs::DialogClosedEvent aEvt( aEvent );
             m_aDialogClosedLink.Call( &aEvt );
         }
     }
@@ -49,7 +49,7 @@ namespace svt
     // XEventListener methods
     void SAL_CALL DialogClosedListener::disposing( const EventObject& ) throw(RuntimeException, std::exception)
     {
-        m_aDialogClosedLink = Link<>();
+        m_aDialogClosedLink = Link<css::ui::dialogs::DialogClosedEvent*,void>();
     }