mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert Link<> to typed

Browse Source 
Change-Id: I70de366349801fed36fb5d62bc53236efa8b6967
This commit is contained in:
Noel Grandin 2015-09-17 09:51:43 +02:00
parent b56850ecbc
commit c7fe6e7ed0
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
formula/source/ui/dlg/formula.cxx
View File

@ -130,7 +130,7 @@ public:
DECL_LINK_TYPED( BtnHdl, Button*, void );
DECL_LINK_TYPED( DblClkHdl, FuncPage&, void );
DECL_LINK_TYPED( FuncSelHdl, FuncPage&, void );
DECL_LINK(StructSelHdl, void *);
DECL_LINK_TYPED( StructSelHdl, StructPage&, void );
public:
mutable uno::Reference< sheet::XFormulaOpCodeMapper> m_xOpCodeMapper;
uno::Sequence< sheet::FormulaToken > m_aTokenList;
@ -1580,13 +1580,12 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
m_pTabCtrl->SetCurPageId(TP_STRUCT);
return bMatrix;
}
IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl)
IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, StructSelHdl, StructPage&, void)
{
bStructUpdate=false;
if(pStructPage->IsVisible()) m_pBtnForward->Enable(false); //@New
if(pStructPage->IsVisible())
m_pBtnForward->Enable(false); //@New
bStructUpdate=true;
return 0;
}
IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, MatrixHdl, Button*, void)
{

2
formula/source/ui/dlg/structpg.cxx
View File

@ -190,7 +190,7 @@ IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void )
}
}
aSelLink.Call(this);
aSelLink.Call(*this);
}
}

6
formula/source/ui/dlg/structpg.hxx
View File

@ -70,8 +70,8 @@ class StructPage : public TabPage
, public IStructHelper
{
private:
OModuleClient m_aModuleClient;
Link<> aSelLink;
OModuleClient m_aModuleClient;
Link<StructPage&,void> aSelLink;
VclPtr<StructListBox> m_pTlbStruct;
Image maImgEnd;
@ -99,7 +99,7 @@ public:
virtual OUString GetEntryText(SvTreeListEntry* pEntry) const SAL_OVERRIDE;
void SetSelectionHdl( const Link<>& rLink ) { aSelLink = rLink; }
void SetSelectionHdl( const Link<StructPage&,void>& rLink ) { aSelLink = rLink; }
StructListBox* GetTlbStruct() const { return m_pTlbStruct; }
};