convert Link<> to typed

Change-Id: I1876f327607e0e23292950741df348d4ec31fde1

5 files changed, 7 insertions, 9 deletions

diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 0eed8a8370e1..afda84c55f14 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -28,6 +28,7 @@
 
 class SfxObjectShell;
 struct AreaLink_Impl;
+class Dialog;
 
 class SC_DLLPUBLIC ScAreaLink : public ::sfx2::SvBaseLink, public ScRefreshTimer
 {
@@ -75,7 +76,7 @@ public:
     const ScRange&  GetDestArea() const     { return aDestArea;     }
 
     DECL_LINK_TYPED( RefreshHdl, Timer*, void );
-    DECL_LINK( AreaEndEditHdl, void* );
+    DECL_LINK_TYPED( AreaEndEditHdl, Dialog&, void );
 };
 
 #endif
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 5f83f0fddbdc..5932e945a6ff 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -73,7 +73,7 @@ public:                                             \
                      : pDlg(p)                      \
                      {}                             \
     virtual         ~Class();                       \
-    virtual void    StartExecuteModal( const Link<>& rEndDialogHdl ) override; \
+    virtual void    StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; \
     long            GetResult() override;
 
 #define IMPL_ABSTDLG_BASE(Class)                    \
@@ -89,7 +89,7 @@ short Class::Execute()                              \
 Class::~Class()                                     \
 {                                                   \
 }                                                   \
-void Class::StartExecuteModal( const Link<>& rEndDialogHdl ) \
+void Class::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) \
 {                                                   \
     pDlg->StartExecuteModal( rEndDialogHdl ) ;      \
 }                                                   \
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index f1f24800df08..016cd7985caf 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG_TYPED(ScAreaLink, RefreshHdl, Timer *, void)
     Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() );
 }
 
-IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl)
+IMPL_LINK_NOARG_TYPED(ScAreaLink, AreaEndEditHdl, Dialog&, void)
 {
     //  #i76514# can't use link argument to access the dialog,
     //  because it's the ScLinkedAreaDlg, not AbstractScLinkedAreaDlg
@@ -504,8 +504,6 @@ IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl)
         SetName( aNewLinkName );
     }
     pImpl->m_pDialog = NULL;    // dialog is deleted with parent
-
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 148b9671c607..84810ef2b1a7 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -64,7 +64,7 @@ private:
     void ExecuteFillSingleEdit();
 
     DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void );
-    DECL_LINK( DialogClosed, void* );
+    DECL_LINK_TYPED( DialogClosed, Dialog&, void );
 
     RotateTransliteration m_aRotateCase;
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 8ee420b4bcc0..12d61c54102f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2884,7 +2884,7 @@ void ScCellShell::ExecuteFillSingleEdit()
     SC_MOD()->SetInputMode(SC_INPUT_TABLE, &aInit);
 }
 
-IMPL_LINK_NOARG(ScCellShell, DialogClosed)
+IMPL_LINK_NOARG_TYPED(ScCellShell, DialogClosed, Dialog&, void)
 {
     assert(pImpl->m_pLinkedDlg && "ScCellShell::DialogClosed(): invalid request");
     assert(pImpl->m_pRequest && "ScCellShell::DialogClosed(): invalid request");
@@ -2911,7 +2911,6 @@ IMPL_LINK_NOARG(ScCellShell, DialogClosed)
     }
 
     ExecuteExternalSource( sFile, sFilter, sOptions, sSource, nRefresh, *(pImpl->m_pRequest) );
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */