diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 13:53:17 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 16:19:37 +0000 |
commit | e85b2333bce7b1dcae73861df6d90b48b9f4efe5 (patch) | |
tree | 21d066cecfbfda9ace96b26953ddcc3ae1764001 /fpicker | |
parent | ff6462e6307e6924dc6c8178043ae9032f4b4152 (diff) |
convert Link<> to typed
Change-Id: I59d325c3b051690303a5841907317122fa1ec98b
Reviewed-on: https://gerrit.libreoffice.org/18825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 3 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 5 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index b3a60c860cbc..83cd52c98cf6 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -980,10 +980,9 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void ) } } -IMPL_LINK_NOARG( RemoteFilesDialog, FileNameGetFocusHdl ) +IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, FileNameGetFocusHdl, Control&, void ) { m_pFileView->SetNoSelection(); - return 1; } IMPL_LINK_NOARG( RemoteFilesDialog, FileNameModifyHdl ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 30fff9de7beb..78488cc15a5c 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -192,7 +192,7 @@ private: DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK( FileNameGetFocusHdl, void * ); + DECL_LINK_TYPED( FileNameGetFocusHdl, Control&, void ); DECL_LINK( FileNameModifyHdl, void * ); DECL_LINK_TYPED( SplitHdl, Splitter*, void ); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index b684ae9d34df..0f850eabb3f2 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1312,18 +1312,17 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void) ExecuteFilter(); } -IMPL_LINK_NOARG( SvtFileDialog, FileNameGetFocusHdl_Impl ) +IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void ) { _pFileView->SetNoSelection(); _pFileView->Update(); - return 0; } IMPL_LINK_NOARG( SvtFileDialog, FileNameModifiedHdl_Impl ) { - FileNameGetFocusHdl_Impl( NULL ); + FileNameGetFocusHdl_Impl( *_pImp->_pEdFileName ); return 0; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 93c493426037..19b5d8ab0e2e 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -90,7 +90,7 @@ private: DECL_LINK_TYPED( OpenUrlHdl_Impl, SvtURLBox*, void ); DECL_LINK_TYPED( OpenClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( CancelHdl_Impl, Button*, void ); - DECL_LINK( FileNameGetFocusHdl_Impl, void* ); + DECL_LINK_TYPED( FileNameGetFocusHdl_Impl, Control&, void ); DECL_LINK( FileNameModifiedHdl_Impl, void* ); DECL_LINK_TYPED( URLBoxModifiedHdl_Impl, SvtURLBox*, void ); |