diff options
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 9 | ||||
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/breadcrumb.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/breadcrumb.cxx | 2 |
4 files changed, 6 insertions, 11 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index cce10e66d1c0..7f2600d8a64e 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -977,14 +977,9 @@ IMPL_LINK ( RemoteFilesDialog, TreeSelectHdl, FolderTree *, pBox ) return 1; } -IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr ) +IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void ) { - if( pPtr ) - { - OpenURL( pPtr->GetHdlURL() ); - } - - return 1; + OpenURL( pPtr->GetHdlURL() ); } IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 4fe118868ea6..223ba5bcf55e 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -196,7 +196,7 @@ private: DECL_LINK( TreeSelectHdl, FolderTree * ); - DECL_LINK( SelectBreadcrumbHdl, Breadcrumb * ); + DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void ); DECL_LINK( NewFolderHdl, void * ); diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index ddd377dee1a2..d749f2736dc3 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -39,7 +39,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox SvtBreadcrumbMode m_eMode; - Link<> m_aClickHdl; + Link<Breadcrumb*,void> m_aClickHdl; void appendField(); bool showField( unsigned int nIndex, unsigned int nWidthMax ); @@ -53,7 +53,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox void dispose() SAL_OVERRIDE; void EnableFields( bool bEnable ); - void SetClickHdl( const Link<>& rLink ); + void SetClickHdl( const Link<Breadcrumb*,void>& rLink ); OUString GetHdlURL(); void SetRootName( const OUString& rURL ); diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 4636a6d6e9aa..306d33ffdb22 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -43,7 +43,7 @@ void Breadcrumb::EnableFields( bool bEnable ) } } -void Breadcrumb::SetClickHdl( const Link<>& rLink ) +void Breadcrumb::SetClickHdl( const Link<Breadcrumb*,void>& rLink ) { m_aClickHdl = rLink; } |