4 files changed, 6 insertions, 8 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 4905f7ae7acf..edfae1bbb8d4 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -87,8 +87,7 @@ private:
 class ArgInput
 {
 private:
-
-    Link<>          aFxClickLink;
+    Link<ArgInput&,void>          aFxClickLink;
     Link<>          aRefClickLink;
     Link<>          aFxFocusLink;
     Link<>          aRefFocusLink;
@@ -139,7 +138,7 @@ public:
     ArgEdit*    GetArgEdPtr() {return pEdArg;}
 
 
-    void            SetFxClickHdl( const Link<>& rLink ) { aFxClickLink = rLink; }
+    void            SetFxClickHdl( const Link<ArgInput&,void>& rLink ) { aFxClickLink = rLink; }
 
     void            SetFxFocusHdl( const Link<>& rLink ) { aFxFocusLink = rLink; }
 
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index a88e3694aba6..ad9d5538fbd1 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -266,7 +266,7 @@ void ArgInput::UpdateAccessibleNames()
 
 void ArgInput::FxClick()
 {
-    aFxClickLink.Call(this);
+    aFxClickLink.Call(*this);
 }
 
 void ArgInput::RefClick()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 4cb2352a1b48..ddf4c5764d3d 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -548,13 +548,13 @@ void ParaWin::FxClick()
 }
 
 
-IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
+IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void )
 {
     sal_uInt16 nOffset = GetSliderPos();
     nEdFocus=NOT_FOUND;
     for (sal_uInt16 nPos=0; nPos < SAL_N_ELEMENTS(aArgInput); ++nPos)
     {
-        if(pPtr == &aArgInput[nPos])
+        if(&rPtr == &aArgInput[nPos])
         {
             nEdFocus=nPos;
             break;
@@ -567,7 +567,6 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
         nActiveLine=nEdFocus+nOffset;
         FxClick();
     }
-    return 0;
 }
 
 IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 46332891ec53..7d82663690cd 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -97,7 +97,7 @@ private:
         DECL_LINK( ModifyHdl, ArgInput* );
         DECL_LINK( GetEdFocusHdl, ArgInput* );
         DECL_LINK( GetFxFocusHdl, ArgInput* );
-        DECL_LINK( GetFxHdl, ArgInput* );
+        DECL_LINK_TYPED( GetFxHdl, ArgInput&, void );
 
 protected: