diff options
Diffstat (limited to 'sw/source/ui/fldui/flddok.cxx')
| -rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 424152214e11..00d91dc60038 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -192,7 +192,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) } } } - TypeHdl(0); + TypeHdl(*m_pTypeLB); if (IsFieldEdit()) { @@ -205,7 +205,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void) { // save old ListBoxPos const sal_Int32 nOld = GetTypeSel(); @@ -300,7 +300,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl) } } } - m_pSelectionLB->SetSelectHdl(Link<>()); + m_pSelectionLB->SetSelectHdl(Link<ListBox&,void>()); } else { @@ -450,8 +450,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl) m_pValueFT->Enable(bValue || bLevel || bOffset); m_pValueED->Enable(bValue); } - - return 0; } void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId) @@ -460,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId) m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } -IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDokPage, SubTypeHdl, ListBox&, void) { sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) @@ -490,8 +488,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl) if( nTextRes ) m_pValueFT->SetText( SW_RESSTR( nTextRes )); - - return 0; } sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) @@ -524,12 +520,12 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) } } - FormatHdl(); + FormatHdl(*m_pFormatLB); return nSize; } -IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDokPage, FormatHdl, ListBox&, void) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); @@ -557,8 +553,6 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl) if (sOldText != m_pValueFT->GetText()) m_pValueED->SetText( aEmptyOUStr ); } - - return 0; } bool SwFieldDokPage::FillItemSet(SfxItemSet* ) |