diff options
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 9 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index a435d1caad57..33c3d97b9101 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -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) { diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index a1900081a8b9..fcbf0e6b3834 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -190,7 +190,7 @@ IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) } } - aSelLink.Call(this); + aSelLink.Call(*this); } } diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index ae8fac934302..de84f7b4b34a 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -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; } }; |