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

convert Link<> to typed

Change-Id: I70fab365886ef1c6ed755ec86ebd7952ca613ea7
üst 06193462
......@@ -30,7 +30,7 @@ class EditBox : public Control
private:
VclPtr<MultiLineEdit> pMEdit;
Link<> aSelChangedLink;
Link<EditBox&,void> aSelChangedLink;
Selection aOldSel;
bool bMouseFlag;
......@@ -52,7 +52,7 @@ public:
MultiLineEdit* GetEdit() {return pMEdit;}
void SetSelChangedHdl( const Link<>& rLink ) { aSelChangedLink = rLink; }
void SetSelChangedHdl( const Link<EditBox&,void>& rLink ) { aSelChangedLink = rLink; }
void UpdateOldSel();
};
......
......@@ -124,9 +124,9 @@ public:
DECL_LINK( ModifyHdl, ParaWin* );
DECL_LINK( FxHdl, ParaWin* );
DECL_LINK_TYPED(MatrixHdl, Button*, void);
DECL_LINK_TYPED( MatrixHdl, Button*, void);
DECL_LINK(FormulaHdl, void *);
DECL_LINK(FormulaCursorHdl, void *);
DECL_LINK_TYPED( FormulaCursorHdl, EditBox&, void);
DECL_LINK_TYPED( BtnHdl, Button*, void );
DECL_LINK(DblClkHdl, void *);
DECL_LINK(FuncSelHdl, void *);
......@@ -1354,10 +1354,10 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl)
return 0;
}
IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl)
IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void)
{
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData) return 0;
if (!pData) return;
sal_Int32 nFStart = pData->GetFStart();
bEditFlag=true;
......@@ -1419,7 +1419,6 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl)
m_pHelper->setSelection(aSel.Min(), aSel.Max());
bEditFlag=false;
return 0;
}
void FormulaDlg_Impl::UpdateSelection()
......@@ -1527,7 +1526,7 @@ void FormulaDlg_Impl::Update()
const OUString sExpression = pMEdit->GetText();
aOldFormula.clear();
UpdateTokenArray(sExpression);
FormulaCursorHdl(m_pMEFormula);
FormulaCursorHdl(*m_pMEFormula);
CalcStruct(sExpression);
if(pData->GetMode() == FORMULA_FORMDLG_FORMULA)
m_pTabCtrl->SetCurPageId(TP_FUNCTION);
......
......@@ -378,7 +378,7 @@ void EditBox::dispose()
// When the selection is changed this function will be called
void EditBox::SelectionChanged()
{
aSelChangedLink.Call(this);
aSelChangedLink.Call(*this);
}
// When the size is changed, MultiLineEdit must be adapted..
......
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