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 /svx | |
parent | d7efea29cdc2faa57d172d7e4d8def18fd49536c (diff) |
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/datanavi.cxx | 7 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 6 | ||||
-rw-r--r-- | svx/source/inc/datanavi.hxx | 8 | ||||
-rw-r--r-- | svx/source/inc/fmexpl.hxx | 2 | ||||
-rw-r--r-- | svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 3 | ||||
-rw-r--r-- | svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 2 |
6 files changed, 11 insertions, 17 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 1879f0d13c52..1ad38717937d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -391,10 +391,9 @@ namespace svxform DoToolBoxAction( m_pToolBox->GetCurItemId() ); } - IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl) + IMPL_LINK_NOARG_TYPED(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) { EnableMenuItems( NULL ); - return 0; } void XFormsPage::AddChildren( @@ -2949,13 +2948,11 @@ namespace svxform } - IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, ) + IMPL_LINK_NOARG_TYPED( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) { bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL ); m_pEditNamespaceBtn->Enable( bEnable ); m_pDeleteNamespaceBtn->Enable( bEnable ); - - return 0; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 58ca669f076e..9364f40a2258 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1526,20 +1526,18 @@ namespace svxform } - IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) + IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { m_sdiState = SDI_DIRTY; if (IsSelectionHandlingLocked()) - return 0L; + return; if (m_aSynchronizeTimer.IsActive()) m_aSynchronizeTimer.Stop(); m_aSynchronizeTimer.SetTimeout(EXPLORER_SYNC_DELAY); m_aSynchronizeTimer.Start(); - - return 0L; } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index e37521bba127..dbb1180f6902 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -273,14 +273,14 @@ namespace svxform bool m_bLinkOnce; DECL_LINK_TYPED(TbxSelectHdl, ToolBox *, void); - DECL_LINK(ItemSelectHdl, void *); + DECL_LINK_TYPED(ItemSelectHdl, SvTreeListBox*, void); void AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, const XNode_ref& _xNode ); bool DoToolBoxAction( sal_uInt16 _nToolBoxID ); - SvTreeListEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); - SvTreeListEntry* AddEntry( const XPropertySet_ref& _rPropSet ); + SvTreeListEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); + SvTreeListEntry* AddEntry( const XPropertySet_ref& _rPropSet ); void EditEntry( const XPropertySet_ref& _rPropSet ); bool RemoveEntry(); @@ -528,7 +528,7 @@ namespace svxform XNameContainer_ref& m_rNamespaces; - DECL_LINK( SelectHdl, SvSimpleTable * ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( OKHdl, Button*, void); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index ec65af0b0d4f..ef470fe03e7f 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -477,7 +477,7 @@ namespace svxform DECL_LINK_TYPED( OnEdit, void*, void ); DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); - DECL_LINK(OnEntrySelDesel, NavigatorTree*); + DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void); DECL_LINK_TYPED(OnSynchronizeTimer, Timer*, void); DECL_LINK( OnClipboardAction, void* ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 3c2b6ffb8796..5697713c8a0c 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -625,7 +625,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl) updateButtons(); return 0; } -IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl) +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if(pE) @@ -640,7 +640,6 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl) } updateButtons(); - return 0; } bool ChineseDictionaryDialog::isEditFieldsHaveContent() const diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 265542b409e8..7f1598b525b7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -125,7 +125,7 @@ public: private: DECL_LINK_TYPED( DirectionHdl, Button*, void ); DECL_LINK(EditFieldsHdl, void *); - DECL_LINK( MappingSelectHdl, void* ); + DECL_LINK_TYPED( MappingSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( AddHdl, Button*, void ); DECL_LINK_TYPED( ModifyHdl, Button*, void ); DECL_LINK_TYPED( DeleteHdl, Button*, void ); |