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

convert Link<> to typed

Change-Id: I04987cc8c3eab52a7191d75cf0a9cde9049bfbd4
üst 1ff75530
......@@ -112,7 +112,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
}
}
if(nCount)
EntrySelectHdl(maEntries[0].get());
EntrySelectHdl(*maEntries[0].get());
}
else
{
......@@ -388,10 +388,10 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void )
RecalcAll();
}
IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void )
{
if(pEntry->IsSelected())
return 0;
if(rEntry.IsSelected())
return;
//A child has focus, but we will hide that, so regrab to whatever new thing gets
//shown instead of leaving it stuck in the inaccessible hidden element
......@@ -401,11 +401,10 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
(*itr)->SetInactive();
}
mpDialogParent->InvalidateRefData();
pEntry->SetActive();
rEntry.SetActive();
RecalcAll();
if (bReGrabFocus)
GrabFocus();
return 0;
}
IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void )
......
......@@ -78,7 +78,7 @@ bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
{
ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(this); } );
ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(*this); } );
}
return Control::Notify(rNEvt);
}
......
......@@ -89,7 +89,7 @@ public:
DECL_LINK_TYPED( AddBtnHdl, Button*, void );
DECL_LINK_TYPED( RemoveBtnHdl, Button*, void );
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void );
DECL_LINK_TYPED( TypeListHdl, ListBox&, void );
DECL_LINK_TYPED( AfterTypeListHdl, void*, void );
......
......@@ -43,7 +43,7 @@ class ScCondFrmtEntry : public Control
private:
bool mbActive;
Link<> maClickHdl;
Link<ScCondFrmtEntry&,void> maClickHdl;
//general ui elements
VclPtr<FixedText> maFtCondNr;
......
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