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

Change-Id: I8465811de6794345d79eb29c8efbc70f82b3168e
---
 formula/source/ui/dlg/ControlHelper.hxx |  8 ++++----
 formula/source/ui/dlg/funcutl.cxx       |  4 ++--
 formula/source/ui/dlg/parawin.cxx       | 11 ++++-------
 formula/source/ui/dlg/parawin.hxx       |  4 ++--
 4 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'formula')

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 32224f9c4b9d..d9e12173b290 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -89,8 +89,8 @@ class ArgInput
 private:
     Link<ArgInput&,void>          aFxClickLink;
     Link<ArgInput&,void>          aFxFocusLink;
-    Link<>          aEdFocusLink;
-    Link<>          aEdModifyLink;
+    Link<ArgInput&,void>          aEdFocusLink;
+    Link<ArgInput&,void>          aEdModifyLink;
 
     VclPtr<FixedText>      pFtArg;
     VclPtr<PushButton>     pBtnFx;
@@ -136,9 +136,9 @@ public:
 
     void            SetFxFocusHdl( const Link<ArgInput&,void>& rLink ) { aFxFocusLink = rLink; }
 
-    void            SetEdFocusHdl( const Link<>& rLink ) { aEdFocusLink = rLink; }
+    void            SetEdFocusHdl( const Link<ArgInput&,void>& rLink ) { aEdFocusLink = rLink; }
 
-    void            SetEdModifyHdl( const Link<>& rLink ) { aEdModifyLink = rLink; }
+    void            SetEdModifyHdl( const Link<ArgInput&,void>& rLink ) { aEdModifyLink = rLink; }
 
     void Hide();
     void Show();
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 0e499c14cfbf..50d8b01f3df0 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -271,12 +271,12 @@ void ArgInput::FxFocus()
 
 void ArgInput::EdFocus()
 {
-    aEdFocusLink.Call(this);
+    aEdFocusLink.Call(*this);
 }
 
 void ArgInput::EdModify()
 {
-    aEdModifyLink.Call(this);
+    aEdModifyLink.Call(*this);
 }
 
 IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void )
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index b6cb64859cd4..8e79bcbaedb0 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -592,13 +592,13 @@ IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void )
 
 
 
-IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
+IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, 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;
@@ -613,8 +613,6 @@ IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput*, pPtr )
         ArgumentModified();
         aArgInput[nEdFocus].UpdateAccessibleNames();
     }
-
-    return 0;
 }
 
 
@@ -623,13 +621,13 @@ IMPL_LINK_NOARG_TYPED(ParaWin, ScrollHdl, ScrollBar*, void)
     SliderMoved();
 }
 
-IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr )
+IMPL_LINK_TYPED( ParaWin, ModifyHdl, 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;
@@ -643,7 +641,6 @@ IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr )
     }
 
     ArgumentModified();
-    return 0;
 }
 
 
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 61f3885e6e8c..0eb38c282925 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -94,8 +94,8 @@ private:
                         aParaArray;
 
         DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
-        DECL_LINK( ModifyHdl, ArgInput* );
-        DECL_LINK( GetEdFocusHdl, ArgInput* );
+        DECL_LINK_TYPED( ModifyHdl, ArgInput&, void );
+        DECL_LINK_TYPED( GetEdFocusHdl, ArgInput&, void );
         DECL_LINK_TYPED( GetFxFocusHdl, ArgInput&, void );
         DECL_LINK_TYPED( GetFxHdl, ArgInput&, void );
 
-- 
cgit