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

convert Link<> to typed

Change-Id: I83a418c81a5d1267286236cfcdedc889d34fc963
üst e01bfc7b
...@@ -88,7 +88,7 @@ class ArgInput ...@@ -88,7 +88,7 @@ class ArgInput
{ {
private: private:
Link<ArgInput&,void> aFxClickLink; Link<ArgInput&,void> aFxClickLink;
Link<> aFxFocusLink; Link<ArgInput&,void> aFxFocusLink;
Link<> aRefFocusLink; Link<> aRefFocusLink;
Link<> aEdFocusLink; Link<> aEdFocusLink;
Link<> aEdModifyLink; Link<> aEdModifyLink;
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
void SetFxClickHdl( const Link<ArgInput&,void>& rLink ) { aFxClickLink = rLink; } 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; } void SetEdFocusHdl( const Link<>& rLink ) { aEdFocusLink = rLink; }
......
...@@ -270,7 +270,7 @@ void ArgInput::FxClick() ...@@ -270,7 +270,7 @@ void ArgInput::FxClick()
void ArgInput::FxFocus() void ArgInput::FxFocus()
{ {
aFxFocusLink.Call(this); aFxFocusLink.Call(*this);
} }
void ArgInput::RefFocus() void ArgInput::RefFocus()
......
...@@ -569,13 +569,13 @@ IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) ...@@ -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(); 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;
...@@ -588,7 +588,6 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr ) ...@@ -588,7 +588,6 @@ IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput*, pPtr )
UpdateArgDesc( nEdFocus ); UpdateArgDesc( nEdFocus );
nActiveLine=nEdFocus+nOffset; nActiveLine=nEdFocus+nOffset;
} }
return 0;
} }
......
...@@ -96,7 +96,7 @@ private: ...@@ -96,7 +96,7 @@ private:
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
DECL_LINK( ModifyHdl, ArgInput* ); DECL_LINK( ModifyHdl, ArgInput* );
DECL_LINK( GetEdFocusHdl, ArgInput* ); DECL_LINK( GetEdFocusHdl, ArgInput* );
DECL_LINK( GetFxFocusHdl, ArgInput* ); DECL_LINK_TYPED( GetFxFocusHdl, ArgInput&, void );
DECL_LINK_TYPED( GetFxHdl, ArgInput&, void ); 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