Kaydet (Commit) 20314a1c authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ic1f33a914f62a4f1a309ff4ccd877efb44b80b5b
üst a08471fe
...@@ -87,8 +87,7 @@ private: ...@@ -87,8 +87,7 @@ private:
class ArgInput class ArgInput
{ {
private: private:
Link<ArgInput&,void> aFxClickLink;
Link<> aFxClickLink;
Link<> aRefClickLink; Link<> aRefClickLink;
Link<> aFxFocusLink; Link<> aFxFocusLink;
Link<> aRefFocusLink; Link<> aRefFocusLink;
...@@ -139,7 +138,7 @@ public: ...@@ -139,7 +138,7 @@ public:
ArgEdit* GetArgEdPtr() {return pEdArg;} 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; } void SetFxFocusHdl( const Link<>& rLink ) { aFxFocusLink = rLink; }
......
...@@ -266,7 +266,7 @@ void ArgInput::UpdateAccessibleNames() ...@@ -266,7 +266,7 @@ void ArgInput::UpdateAccessibleNames()
void ArgInput::FxClick() void ArgInput::FxClick()
{ {
aFxClickLink.Call(this); aFxClickLink.Call(*this);
} }
void ArgInput::RefClick() void ArgInput::RefClick()
......
...@@ -548,13 +548,13 @@ void ParaWin::FxClick() ...@@ -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(); sal_uInt16 nOffset = GetSliderPos();
nEdFocus=NOT_FOUND; nEdFocus=NOT_FOUND;
for (sal_uInt16 nPos=0; nPos < SAL_N_ELEMENTS(aArgInput); ++nPos) for (sal_uInt16 nPos=0; nPos < SAL_N_ELEMENTS(aArgInput); ++nPos)
{ {
if(pPtr == &aArgInput[nPos]) if(&rPtr == &aArgInput[nPos])
{ {
nEdFocus=nPos; nEdFocus=nPos;
break; break;
...@@ -567,7 +567,6 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr ) ...@@ -567,7 +567,6 @@ IMPL_LINK( ParaWin, GetFxHdl, ArgInput*, pPtr )
nActiveLine=nEdFocus+nOffset; nActiveLine=nEdFocus+nOffset;
FxClick(); FxClick();
} }
return 0;
} }
IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr ) IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
......
...@@ -97,7 +97,7 @@ private: ...@@ -97,7 +97,7 @@ private:
DECL_LINK( ModifyHdl, ArgInput* ); DECL_LINK( ModifyHdl, ArgInput* );
DECL_LINK( GetEdFocusHdl, ArgInput* ); DECL_LINK( GetEdFocusHdl, ArgInput* );
DECL_LINK( GetFxFocusHdl, ArgInput* ); DECL_LINK( GetFxFocusHdl, ArgInput* );
DECL_LINK( GetFxHdl, ArgInput* ); DECL_LINK_TYPED( GetFxHdl, ArgInput&, void );
protected: protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment