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

convert Link<> to typed

Change-Id: I3defac5fff9708228d9bf3200e51853a127bfdc5
üst 23175c02
...@@ -295,7 +295,7 @@ private: ...@@ -295,7 +295,7 @@ private:
void SetBaseModel(SvTreeList* pNewModel); void SetBaseModel(SvTreeList* pNewModel);
DECL_DLLPRIVATE_LINK_TYPED( CheckButtonClick, SvLBoxButtonData *, void ); DECL_DLLPRIVATE_LINK_TYPED( CheckButtonClick, SvLBoxButtonData *, void );
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * ); DECL_DLLPRIVATE_LINK_TYPED( TextEditEndedHdl_Impl, SvInplaceEdit2&, void );
// Handler that is called by TreeList to clone an Entry // Handler that is called by TreeList to clone an Entry
DECL_DLLPRIVATE_LINK_TYPED( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* ); DECL_DLLPRIVATE_LINK_TYPED( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* );
...@@ -812,13 +812,13 @@ public: ...@@ -812,13 +812,13 @@ public:
class SvInplaceEdit2 class SvInplaceEdit2
{ {
Link<> aCallBackHdl; Link<SvInplaceEdit2&,void> aCallBackHdl;
Accelerator aAccReturn; Accelerator aAccReturn;
Accelerator aAccEscape; Accelerator aAccEscape;
Idle aIdle; Idle aIdle;
VclPtr<Edit> pEdit; VclPtr<Edit> pEdit;
bool bCanceled; bool bCanceled;
bool bAlreadyInCallBack; bool bAlreadyInCallBack;
void CallCallBackHdl_Impl(); void CallCallBackHdl_Impl();
DECL_LINK_TYPED( Timeout_Impl, Idle *, void ); DECL_LINK_TYPED( Timeout_Impl, Idle *, void );
...@@ -827,7 +827,7 @@ class SvInplaceEdit2 ...@@ -827,7 +827,7 @@ class SvInplaceEdit2
public: public:
SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize,
const OUString& rData, const Link<>& rNotifyEditEnd, const OUString& rData, const Link<SvInplaceEdit2&,void>& rNotifyEditEnd,
const Selection&, bool bMultiLine = false ); const Selection&, bool bMultiLine = false );
~SvInplaceEdit2(); ~SvInplaceEdit2();
bool KeyInput( const KeyEvent& rKEvt ); bool KeyInput( const KeyEvent& rKEvt );
......
...@@ -124,12 +124,12 @@ SvInplaceEdit2::SvInplaceEdit2 ...@@ -124,12 +124,12 @@ SvInplaceEdit2::SvInplaceEdit2
vcl::Window* pParent, const Point& rPos, vcl::Window* pParent, const Point& rPos,
const Size& rSize, const Size& rSize,
const OUString& rData, const OUString& rData,
const Link<>& rNotifyEditEnd, const Link<SvInplaceEdit2&,void>& rNotifyEditEnd,
const Selection& rSelection, const Selection& rSelection,
bool bMulti bool bMulti
) : ) :
aCallBackHdl ( rNotifyEditEnd ), aCallBackHdl ( rNotifyEditEnd ),
bCanceled ( false ), bCanceled ( false ),
bAlreadyInCallBack ( false ) bAlreadyInCallBack ( false )
...@@ -253,7 +253,7 @@ void SvInplaceEdit2::CallCallBackHdl_Impl() ...@@ -253,7 +253,7 @@ void SvInplaceEdit2::CallCallBackHdl_Impl()
Application::RemoveAccel( &aAccReturn ); Application::RemoveAccel( &aAccReturn );
Application::RemoveAccel( &aAccEscape ); Application::RemoveAccel( &aAccEscape );
pEdit->Hide(); pEdit->Hide();
aCallBackHdl.Call( this ); aCallBackHdl.Call( *this );
} }
} }
...@@ -993,10 +993,10 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, ...@@ -993,10 +993,10 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect,
rSel, bMulti ); rSel, bMulti );
} }
IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl) IMPL_LINK_NOARG_TYPED(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void)
{ {
if ( nImpFlags & SvTreeListBoxFlags::EDTEND_CALLED ) // avoid nesting if ( nImpFlags & SvTreeListBoxFlags::EDTEND_CALLED ) // avoid nesting
return 0; return;
nImpFlags |= SvTreeListBoxFlags::EDTEND_CALLED; nImpFlags |= SvTreeListBoxFlags::EDTEND_CALLED;
OUString aStr; OUString aStr;
if ( !pEdCtrl->EditingCanceled() ) if ( !pEdCtrl->EditingCanceled() )
...@@ -1011,7 +1011,6 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl) ...@@ -1011,7 +1011,6 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl)
pEdCtrl->Hide(); pEdCtrl->Hide();
nImpFlags &= (~SvTreeListBoxFlags::IN_EDT); nImpFlags &= (~SvTreeListBoxFlags::IN_EDT);
GrabFocus(); GrabFocus();
return 0;
} }
void SvTreeListBox::CancelTextEditing() void SvTreeListBox::CancelTextEditing()
......
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