diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-07 09:35:04 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:46 +0200 |
commit | 61623d5b90510ae6c791a41031d586a9316e74c4 (patch) | |
tree | 0b5a8115ae6d603cbe6208b958d8b440ea8fd06f /sw/source/ui/fldui | |
parent | d7efea29cdc2faa57d172d7e4d8def18fd49536c (diff) |
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r-- | sw/source/ui/fldui/changedb.cxx | 7 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.hxx | 1 |
7 files changed, 16 insertions, 15 deletions
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 0ab326297cfe..3911cd579a5c 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -75,13 +75,13 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) m_pUsedDBTLB->SetSpaceBetweenEntries(0); m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND)); - Link<> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); + Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); m_pUsedDBTLB->SetSelectHdl(aLink); m_pUsedDBTLB->SetDeselectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); - TreeSelectHdl(); + TreeSelectHdl(NULL); } // initialise database listboxes @@ -231,7 +231,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) +IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry(); @@ -242,7 +242,6 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) bEnable = true; m_pDefineBT->Enable( bEnable ); } - return 0; } // convert database name for display diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f433a5e414ff..71c871a23b2a 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -434,7 +434,7 @@ void SwFieldDBPage::CheckInsert() EnableInsert(bInsert); } -IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->GetCurEntry(); if (pEntry) @@ -472,7 +472,6 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) m_pFormat->Enable(bNumFormat); } } - return 0; } IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index b663cc4956ad..cc118696dc17 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -56,7 +56,7 @@ class SwFieldDBPage : public SwFieldPage DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* ); - DECL_LINK( TreeSelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED(AddDBHdl, Button*, void); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 4385b64cd4f3..267c634535e4 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -202,7 +202,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) FillSelectionLB(nSubType); if ( pSelEntry ) - TypeHdl(); + TypeHdl(NULL); m_pTypeTLB->SetUpdateMode(true); m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl)); @@ -219,7 +219,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) { // save old ListBoxPos SvTreeListEntry* pOldEntry = pSelEntry; @@ -236,8 +236,6 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl) FillSelectionLB((sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); SubTypeHdl(); - - return 0; } IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl) diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 7a1ea48df165..e4ebe9278d9b 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -50,7 +50,7 @@ class SwFieldDokInfPage : public SwFieldPage sal_uLong nOldFormat; OUString m_sOldCustomFieldName; - DECL_LINK(TypeHdl, void * = 0); + DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void); DECL_LINK(SubTypeHdl, void * = 0); sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 16f2182c49ab..c7a135a61c8d 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -98,7 +98,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet m_pFormatLB->SetDoubleClickHdl (LINK(this, SwFieldRefPage, InsertHdl)); // #i83479# - m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeHdl) ); + m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeTreeListBoxHdl) ); m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) ); m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL ); m_pSelectionToolTipLB->SetSpaceBetweenEntries(1); @@ -407,13 +407,17 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl) bool bFormat = nSize != 0; m_pFormat->Enable(bFormat); - SubTypeHdl(); - ModifyHdl(); + SubTypeHdl(NULL); + ModifyHdl(NULL); } return 0; } +IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) +{ + SubTypeHdl(NULL); +} IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index bb1f683d7b5e..24e5944d6b1b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -62,6 +62,7 @@ class SwFieldRefPage : public SwFieldPage DECL_LINK(TypeHdl, void *); DECL_LINK(SubTypeHdl, void * = 0); + DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void); DECL_LINK(ModifyHdl, void * = 0); void UpdateSubType(); |