diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-15 08:13:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-16 09:11:29 +0000 |
| commit | 6f1313b3d44ea54e9a331e0fc00871081fa662fe (patch) | |
| tree | fa6d9b6da04daedcb63ea2a0bc8c414288ed8bc6 /sw/source/ui/table | |
| parent | 14bf708ef586b15dffed66ffaf524baf4d8fcbfa (diff) | |
convert Link<> to typed
Change-Id: Icbba339dac0be31e30dff021bba06a219f8aecd6
Reviewed-on: https://gerrit.libreoffice.org/19405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/ui/table')
| -rw-r--r-- | sw/source/ui/table/colwd.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/table/instable.cxx | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index bea63ffdec9f..36286e35af1a 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -31,13 +31,12 @@ #include <cmdid.h> #include <table.hrc> -IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl) +IMPL_LINK_NOARG_TYPED(SwTableWidthDlg, LoseFocusHdl, Edit&, void) { sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1; const SwTwips lWidth = rFnc.GetColWidth(nId); m_pWidthMF->SetMax(m_pWidthMF->Normalize(rFnc.GetMaxColWidth(nId)), FUNIT_TWIP); m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP); - return 0; } SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc ) @@ -62,7 +61,7 @@ SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc ) m_pWidthMF->SetMin(m_pWidthMF->Normalize(rFnc.GetColWidth(0)), FUNIT_TWIP); m_pColNF->SetMax(rFnc.GetColCount() +1 ); m_pColNF->SetModifyHdl(LINK(this,SwTableWidthDlg, LoseFocusHdl)); - LoseFocusHdl(); + LoseFocusHdl(*m_pColNF); } SwTableWidthDlg::~SwTableWidthDlg() diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index 4543d83df4c6..8b4c845d3af9 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -156,22 +156,21 @@ void SwInsTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK( SwInsTableDlg, ModifyName, Edit *, pEdit ) +IMPL_LINK_TYPED( SwInsTableDlg, ModifyName, Edit&, rEdit, void ) { - OUString sTableName = pEdit->GetText(); + OUString sTableName = rEdit.GetText(); if (sTableName.indexOf(' ') != -1) { sTableName = sTableName.replaceAll(" ", ""); - pEdit->SetText(sTableName); + rEdit.SetText(sTableName); } m_pInsertBtn->Enable(pShell->GetTableStyle( sTableName ) == 0); - return 0; } -IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField ) +IMPL_LINK_TYPED( SwInsTableDlg, ModifyRowCol, Edit&, rEdit, void ) { - if(pField == m_pColNF) + if(&rEdit == m_pColNF) { sal_Int64 nCol = m_pColNF->GetValue(); if(!nCol) @@ -196,9 +195,7 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField ) else if( nActVal < nEnteredValRepeatHeaderNF ) m_pRepeatHeaderNF->SetValue( ( nEnteredValRepeatHeaderNF < nMax )? nEnteredValRepeatHeaderNF : nMax ); } - return 0; } - IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); @@ -221,10 +218,9 @@ IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) m_pRepeatGroup->Enable(m_pHeaderCB->IsChecked() && m_pRepeatHeaderCB->IsChecked()); } -IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl) +IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl, Edit&, void) { nEnteredValRepeatHeaderNF = m_pRepeatHeaderNF->GetValue(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |