From c378153149d2fbdf16ed57630baca9a20c990b9a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 17 Sep 2015 09:38:38 +0200
Subject: convert Link<> to typed

Change-Id: I83a418c81a5d1267286236cfcdedc889d34fc963
---
 formula/source/ui/dlg/ControlHelper.hxx | 4 ++--
 formula/source/ui/dlg/funcutl.cxx       | 2 +-
 formula/source/ui/dlg/parawin.cxx       | 5 ++---
 formula/source/ui/dlg/parawin.hxx       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'formula')

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index da790d02c7b7..e30fbb5d2505 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -88,7 +88,7 @@ class ArgInput
 {
 private:
     Link<ArgInput&,void>          aFxClickLink;
-    Link<>          aFxFocusLink;
+    Link<ArgInput&,void>          aFxFocusLink;
     Link<>          aRefFocusLink;
     Link<>          aEdFocusLink;
     Link<>          aEdModifyLink;
@@ -137,7 +137,7 @@ public:
 
     void            SetFxClickHdl( const Link<ArgInput&,void>& rLink ) { aFxClickLink = rLink; }
 
-    void            SetFxFocusHdl( const Link<>& rLink ) { aFxFocusLink = rLink; }
+    void            SetFxFocusHdl( const Link<ArgInput&,void>& rLink ) { aFxFocusLink = rLink; }
 
     void            SetEdFocusHdl( const Link<>& rLink ) { aEdFocusLink = rLink; }
 
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index ad256b135310..53ba36efcecf 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -270,7 +270,7 @@ void ArgInput::FxClick()
 
 void ArgInput::FxFocus()
 {
-    aFxFocusLink.Call(this);
+    aFxFocusLink.Call(*this);
 }
 
 void ArgInput::RefFocus()
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index ddf4c5764d3d..b6cb64859cd4 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -569,13 +569,13 @@ IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void )
     }
 }
 
-IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
+IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, 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;
@@ -588,7 +588,6 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
         UpdateArgDesc( nEdFocus );
         nActiveLine=nEdFocus+nOffset;
     }
-    return 0;
 }
 
 
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 7d82663690cd..61f3885e6e8c 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -96,7 +96,7 @@ private:
         DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
         DECL_LINK( ModifyHdl, ArgInput* );
         DECL_LINK( GetEdFocusHdl, ArgInput* );
-        DECL_LINK( GetFxFocusHdl, ArgInput* );
+        DECL_LINK_TYPED( GetFxFocusHdl, ArgInput&, void );
         DECL_LINK_TYPED( GetFxHdl, ArgInput&, void );
 
 protected:
-- 
cgit