diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /formula | |
parent | starmath: Assert the precondition for OUString#replaceAt() (diff) | |
download | core-106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb.tar.gz core-106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb.zip |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 40 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 12 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 2 |
9 files changed, 47 insertions, 47 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index b1a6ed81d8a5..4fc48cc69f8d 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -34,7 +34,7 @@ private: Selection aOldSel; bool bMouseFlag; - DECL_LINK_TYPED(ChangedHdl, void *, void); + DECL_LINK(ChangedHdl, void *, void); protected: @@ -96,10 +96,10 @@ private: VclPtr<ArgEdit> pEdArg; VclPtr<RefButton> pRefBtn; - DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); - DECL_LINK_TYPED( FxBtnFocusHdl, Control&, void ); - DECL_LINK_TYPED( EdFocusHdl, Control&, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); + DECL_LINK( FxBtnClickHdl, Button*, void ); + DECL_LINK( FxBtnFocusHdl, Control&, void ); + DECL_LINK( EdFocusHdl, Control&, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); protected: diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index b24759eb0324..b758523ae951 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -124,16 +124,16 @@ public: const FormulaHelper& GetFormulaHelper() const { return m_aFormulaHelper;} uno::Reference< sheet::XFormulaOpCodeMapper > const & GetFormulaOpCodeMapper() const; - DECL_LINK_TYPED( ModifyHdl, ParaWin&, void ); - DECL_LINK_TYPED( FxHdl, ParaWin&, void ); - - DECL_LINK_TYPED( MatrixHdl, Button*, void ); - DECL_LINK_TYPED( FormulaHdl, Edit&, void); - DECL_LINK_TYPED( FormulaCursorHdl, EditBox&, void ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( DblClkHdl, FuncPage&, void ); - DECL_LINK_TYPED( FuncSelHdl, FuncPage&, void ); - DECL_LINK_TYPED( StructSelHdl, StructPage&, void ); + DECL_LINK( ModifyHdl, ParaWin&, void ); + DECL_LINK( FxHdl, ParaWin&, void ); + + DECL_LINK( MatrixHdl, Button*, void ); + DECL_LINK( FormulaHdl, Edit&, void); + DECL_LINK( FormulaCursorHdl, EditBox&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( DblClkHdl, FuncPage&, void ); + DECL_LINK( FuncSelHdl, FuncPage&, void ); + DECL_LINK( StructSelHdl, StructPage&, void ); public: mutable uno::Reference< sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; uno::Sequence< sheet::FormulaToken > m_aTokenList; @@ -1009,7 +1009,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk) } -IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) +IMPL_LINK( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnCancel ) { @@ -1056,7 +1056,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) // Handler for Listboxes -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl, FuncPage&, void) { sal_Int32 nFunc = pFuncPage->GetFunction(); @@ -1240,7 +1240,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) } } -IMPL_LINK_TYPED( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) +IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) { if(&rPtr==pParaWin) { @@ -1274,7 +1274,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_TYPED( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) +IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) { if(&rPtr==pParaWin) { @@ -1286,7 +1286,7 @@ IMPL_LINK_TYPED( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void ) } } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaHdl, Edit&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaHdl, Edit&, void) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -1350,7 +1350,7 @@ IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaHdl, Edit&, void) bEditFlag=false; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void) { FormEditData* pData = m_pHelper->getFormEditData(); if (!pData) return; @@ -1587,20 +1587,20 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula) m_pTabCtrl->SetCurPageId(TP_STRUCT); return bMatrix; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, StructSelHdl, StructPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl, StructPage&, void) { bStructUpdate=false; if(pStructPage->IsVisible()) m_pBtnForward->Enable(false); //@New bStructUpdate=true; } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, MatrixHdl, Button*, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl, Button*, void) { bUserMatrixFlag=true; UpdateValues(true); } -IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, FuncSelHdl, FuncPage&, void) +IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl, FuncPage&, void) { if ( (pFuncPage->GetFunctionEntryCount() > 0) && (pFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) ) @@ -1878,7 +1878,7 @@ void FormulaDlg::SetEdSelection() m_pImpl->SetEdSelection(); } -IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Idle *, void) +IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl, Idle *, void) { FormEditData* pData = m_pImpl->m_pHelper->getFormEditData(); if (!pData) diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index aa4502a81ab5..42dd5adc1656 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -160,7 +160,7 @@ void FuncPage::UpdateFunctionList() if(IsVisible()) SelHdl(*m_pLbFunction); } -IMPL_LINK_TYPED( FuncPage, SelHdl, ListBox&, rLb, void ) +IMPL_LINK( FuncPage, SelHdl, ListBox&, rLb, void ) { if(&rLb==m_pLbFunction) { @@ -180,7 +180,7 @@ IMPL_LINK_TYPED( FuncPage, SelHdl, ListBox&, rLb, void ) } } -IMPL_LINK_NOARG_TYPED(FuncPage, DblClkHdl, ListBox&, void) +IMPL_LINK_NOARG(FuncPage, DblClkHdl, ListBox&, void) { aDoubleClickLink.Call(*this); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index f7ef009c3b0f..b47c641de5f3 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -71,8 +71,8 @@ private: void impl_addFunctions(const IFunctionCategory* _pCategory); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED(DblClkHdl, ListBox&, void); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK(DblClkHdl, ListBox&, void); protected: diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index d67bb00633a1..f1f014cebb0c 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -280,25 +280,25 @@ void ArgInput::EdModify() aEdModifyLink.Call(*this); } -IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) +IMPL_LINK( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) { if(pBtn == pBtnFx) FxClick(); } -IMPL_LINK_TYPED( ArgInput, FxBtnFocusHdl, Control&, rControl, void ) +IMPL_LINK( ArgInput, FxBtnFocusHdl, Control&, rControl, void ) { if(&rControl == pBtnFx) FxFocus(); } -IMPL_LINK_TYPED( ArgInput, EdFocusHdl, Control&, rControl, void ) +IMPL_LINK( ArgInput, EdFocusHdl, Control&, rControl, void ) { if(&rControl == pEdArg) EdFocus(); } -IMPL_LINK_TYPED( ArgInput, EdModifyHdl, Edit&, rEdit, void ) +IMPL_LINK( ArgInput, EdModifyHdl, Edit&, rEdit, void ) { if(&rEdit == pEdArg) EdModify(); @@ -403,7 +403,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt ) //When an Event cleared wurde, this routine is //first called. -IMPL_LINK_NOARG_TYPED(EditBox, ChangedHdl, void*, void) +IMPL_LINK_NOARG(EditBox, ChangedHdl, void*, void) { if(pMEdit!=nullptr) { @@ -553,7 +553,7 @@ void RefEdit::LoseFocus() pAnyRefDlg->HideReference(); } -IMPL_LINK_NOARG_TYPED(RefEdit, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(RefEdit, UpdateHdl, Idle *, void) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference( GetText() ); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index a7d5c66e3929..51a87c187985 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -548,7 +548,7 @@ void ParaWin::FxClick() } -IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -569,7 +569,7 @@ IMPL_LINK_TYPED( ParaWin, GetFxHdl, ArgInput&, rPtr, void ) } } -IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -591,7 +591,7 @@ IMPL_LINK_TYPED( ParaWin, GetFxFocusHdl, ArgInput&, rPtr, void ) } -IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; @@ -615,12 +615,12 @@ IMPL_LINK_TYPED( ParaWin, GetEdFocusHdl, ArgInput&, rPtr, void ) } -IMPL_LINK_NOARG_TYPED(ParaWin, ScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(ParaWin, ScrollHdl, ScrollBar*, void) { SliderMoved(); } -IMPL_LINK_TYPED( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) +IMPL_LINK( ParaWin, ModifyHdl, ArgInput&, rPtr, void ) { sal_uInt16 nOffset = GetSliderPos(); nEdFocus=NOT_FOUND; diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index b50192017591..e6d4a65638ab 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -92,11 +92,11 @@ private: ::std::vector<OUString> aParaArray; - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED( ModifyHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetEdFocusHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetFxFocusHdl, ArgInput&, void ); - DECL_LINK_TYPED( GetFxHdl, ArgInput&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void); + DECL_LINK( ModifyHdl, ArgInput&, void ); + DECL_LINK( GetEdFocusHdl, ArgInput&, void ); + DECL_LINK( GetFxFocusHdl, ArgInput&, void ); + DECL_LINK( GetFxHdl, ArgInput&, void ); protected: diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 0be4acef4a66..7b5c4bcd7ca0 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -170,7 +170,7 @@ IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry) return nullptr; } -IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) +IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) { if(m_pTlbStruct->GetActiveFlag()) { diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 5dab3c593808..873655c21ba9 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -75,7 +75,7 @@ private: IFormulaToken* pSelectedToken; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); using Window::GetParent; |