summaryrefslogtreecommitdiff
path: root/sw/source/ui/config/optload.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/config/optload.cxx')
-rw-r--r--sw/source/ui/config/optload.cxx19
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()