diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
| commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
| tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /fpicker | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 21 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.hxx | 1 |
2 files changed, 9 insertions, 13 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c88e5269ecd0..ae197c5683cb 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -630,7 +630,7 @@ void SvtFileDialog::Init_Impl // set timer for the filterbox travel _pImp->_aFilterTimer.SetTimeout( TRAVELFILTER_TIMEOUT ); - _pImp->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) ); + _pImp->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) ); if ( WB_SAVEAS & nStyle ) { @@ -1147,18 +1147,8 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable ) -IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, pInstance ) +IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, EMPTYARG ) { - DBG_ASSERT( pInstance, "SvtFileDialog:keine Instanz" ); - - // was the handler executed by the travel timer? - if ( pInstance == &pThis->_pImp->_aFilterTimer ) - { - // filter the view again - pThis->ExecuteFilter(); - return 0; - } - OUString sSelectedFilterDisplayName; SvtFileDialogFilter_Impl* pSelectedFilter = pThis->_pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName ); if ( !pSelectedFilter ) @@ -1231,7 +1221,12 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, pInstance ) return 0; } - +IMPL_STATIC_LINK_TYPED( + SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, EMPTYARG, void) +{ + // filter the view again + pThis->ExecuteFilter(); +} IMPL_STATIC_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) { diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 5c67ad2c3164..b0588c02a9c3 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -113,6 +113,7 @@ private: ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_context; DECL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void* ); + DECL_STATIC_LINK_TYPED( SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void ); DECL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton* ); DECL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void* ); DECL_LINK ( CancelHdl_Impl, void* ); |