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 /sfx2 | |
| parent | d7efea29cdc2faa57d172d7e4d8def18fd49536c (diff) | |
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/versdlg.hxx | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4950c2a7b796..1f1cc098d547 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2105,7 +2105,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) } // Selection of a template during the Watercan-Status -IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox ) +IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) { // Trigger Help PI, if this is permitted of call handlers and field if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) @@ -2146,8 +2146,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox } #endif } - - return 0; } IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5fe8966a8c64..1bc6df1a8411 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -376,7 +376,7 @@ IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) return 0L; } -IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) { bool bEnable = ( m_pVersionBox->FirstSelected() != NULL ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); @@ -388,8 +388,6 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy ); SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy ); m_pCompareButton->Enable(bEnable && eState >= SfxItemState::DEFAULT); - - return 0L; } IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index ddb4a6f61ebb..e9383a47adae 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -216,7 +216,7 @@ protected: bool bBindingUpdate :1; DECL_LINK( FilterSelectHdl, ListBox* ); - DECL_LINK( FmtSelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); DECL_LINK( ApplyHdl, Control* ); DECL_LINK( DropHdl, StyleTreeListBox_Impl* ); DECL_LINK_TYPED( TimeOut, Idle*, void ); diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index e9ab98548bd8..b2747d291460 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -58,7 +58,7 @@ class SfxVersionDialog : public SfxModalDialog bool m_bIsSaveVersionOnClose; DECL_LINK(DClickHdl_Impl, void *); - DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); void Init_Impl(); void Open_Impl(); |