diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-10-04 15:05:38 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-12 10:48:13 +0000 |
commit | 3c99f8500f657ed84b316390d5175a6f5e56bc69 (patch) | |
tree | 749f16652560a50d409b12a23bf1a5d93b3cd2d5 /sw/source/ui/config/optload.cxx | |
parent | bbadb38539eb233ac45b267034066a7274181c65 (diff) |
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/ui/config/optload.cxx')
-rw-r--r-- | sw/source/ui/config/optload.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 7b101cecc533..f9ee4c19c368 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -352,7 +352,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); } -IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl) +IMPL_LINK_NOARG_TYPED(SwLoadOptPage, MetricHdl, ListBox&, void) { const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) @@ -368,8 +368,6 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl) if(!bModified) m_pTabMF->ClearModifyFlag(); } - - return 0; } SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet) @@ -533,9 +531,8 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pNumberingSeparatorED->SetModifyHdl( aLk ); m_pTextEdit->SetModifyHdl( aLk ); - aLk = LINK(this, SwCaptionOptPage, SelectHdl); - m_pCategoryBox->SetSelectHdl( aLk ); - m_pFormatBox->SetSelectHdl( aLk ); + m_pCategoryBox->SetSelectHdl( LINK(this, SwCaptionOptPage, SelectHdl) ); + m_pFormatBox->SetSelectHdl( LINK(this, SwCaptionOptPage, SelectListBoxHdl) ); m_pLbCaptionOrder->SetSelectHdl( LINK(this, SwCaptionOptPage, OrderHdl)); @@ -850,7 +847,12 @@ IMPL_LINK_NOARG(SwCaptionOptPage, SelectHdl) return 0; } -IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox ) +IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SelectListBoxHdl, ListBox&, void) +{ + InvalidatePreview(); +} + +IMPL_LINK_TYPED( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) { InvalidatePreview(); @@ -861,10 +863,9 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox*, pBox ) bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry)); } - sal_Int32 nPos = pBox->GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectEntryPos(); m_pNumberingSeparatorFT->Enable( bChecked && nPos == 1 ); m_pNumberingSeparatorED->Enable( bChecked && nPos == 1 ); - return 0; } void SwCaptionOptPage::InvalidatePreview() |