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

convert Link<> to typed

Change-Id: Ia7a63d72048f6abde92b414e58b464cdd611017b
üst e0f617aa
...@@ -309,7 +309,7 @@ class SvxIconChoiceCtrl_Impl ...@@ -309,7 +309,7 @@ class SvxIconChoiceCtrl_Impl
void VisRectChanged() { aVisRectChangedIdle.Start(); } void VisRectChanged() { aVisRectChangedIdle.Start(); }
void SetOrigin( const Point& ); void SetOrigin( const Point& );
DECL_LINK(TextEditEndedHdl, void *); DECL_LINK_TYPED(TextEditEndedHdl, LinkParamNone*, void);
void ShowFocus ( Rectangle& rRect ); void ShowFocus ( Rectangle& rRect );
void DrawFocusRect(vcl::RenderContext& rRenderContext); void DrawFocusRect(vcl::RenderContext& rRenderContext);
......
...@@ -55,7 +55,7 @@ static bool bEndScrollInvalidate = true; ...@@ -55,7 +55,7 @@ static bool bEndScrollInvalidate = true;
class IcnViewEdit_Impl : public MultiLineEdit class IcnViewEdit_Impl : public MultiLineEdit
{ {
Link<> aCallBackHdl; Link<LinkParamNone*,void> aCallBackHdl;
Accelerator aAccReturn; Accelerator aAccReturn;
Accelerator aAccEscape; Accelerator aAccEscape;
Idle aIdle; Idle aIdle;
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
const Point& rPos, const Point& rPos,
const Size& rSize, const Size& rSize,
const OUString& rData, const OUString& rData,
const Link<>& rNotifyEditEnd ); const Link<LinkParamNone*,void>& rNotifyEditEnd );
virtual ~IcnViewEdit_Impl(); virtual ~IcnViewEdit_Impl();
virtual void dispose() SAL_OVERRIDE; virtual void dispose() SAL_OVERRIDE;
...@@ -3025,13 +3025,13 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) ...@@ -3025,13 +3025,13 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) ); LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) );
} }
IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl) IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void)
{ {
DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set"); DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set");
if( !pEdit ) if( !pEdit )
{ {
pCurEditedEntry = 0; pCurEditedEntry = 0;
return 0; return;
} }
DBG_ASSERT(pCurEditedEntry,"TextEditEnded: pCurEditedEntry not set"); DBG_ASSERT(pCurEditedEntry,"TextEditEnded: pCurEditedEntry not set");
...@@ -3040,7 +3040,7 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl) ...@@ -3040,7 +3040,7 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl)
pEdit->Hide(); pEdit->Hide();
if( pEdit->IsGrabFocus() ) if( pEdit->IsGrabFocus() )
pView->GrabFocus(); pView->GrabFocus();
return 0; return;
} }
OUString aText; OUString aText;
...@@ -3059,7 +3059,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl) ...@@ -3059,7 +3059,6 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl)
// The edit can not be deleted here, because it is not within a handler. It // The edit can not be deleted here, because it is not within a handler. It
// will be deleted in the dtor or in the next EditEntry. // will be deleted in the dtor or in the next EditEntry.
pCurEditedEntry = 0; pCurEditedEntry = 0;
return 0;
} }
void SvxIconChoiceCtrl_Impl::StopEntryEditing( bool bCancel ) void SvxIconChoiceCtrl_Impl::StopEntryEditing( bool bCancel )
...@@ -3125,7 +3124,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect, bool bPaint ) ...@@ -3125,7 +3124,7 @@ void SvxIconChoiceCtrl_Impl::SelectAll( bool bSelect, bool bPaint )
} }
IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos, IcnViewEdit_Impl::IcnViewEdit_Impl( SvtIconChoiceCtrl* pParent, const Point& rPos,
const Size& rSize, const OUString& rData, const Link<>& rNotifyEditEnd ) : const Size& rSize, const OUString& rData, const Link<LinkParamNone*,void>& rNotifyEditEnd ) :
MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT), MultiLineEdit( pParent, (pParent->GetStyle() & WB_ICON) ? WB_CENTER : WB_LEFT),
aCallBackHdl( rNotifyEditEnd ), aCallBackHdl( rNotifyEditEnd ),
bCanceled( false ), bCanceled( false ),
...@@ -3178,7 +3177,7 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl() ...@@ -3178,7 +3177,7 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl()
Application::RemoveAccel( &aAccReturn ); Application::RemoveAccel( &aAccReturn );
Application::RemoveAccel( &aAccEscape ); Application::RemoveAccel( &aAccEscape );
Hide(); Hide();
aCallBackHdl.Call( this ); aCallBackHdl.Call( nullptr );
} }
} }
......
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