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 /fpicker | |
| parent | d7efea29cdc2faa57d172d7e4d8def18fd49536c (diff) | |
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 3 | ||||
| -rw-r--r-- | fpicker/source/office/PlacesListBox.hxx | 2 | ||||
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 6 | ||||
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 6d5f8c7479a2..a08bc05d572c 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -175,7 +175,7 @@ Image PlacesListBox::getEntryIcon( PlacePtr pPlace ) return theImage; } -IMPL_LINK_NOARG( PlacesListBox, Selection ) +IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void ) { sal_uInt32 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; @@ -185,7 +185,6 @@ IMPL_LINK_NOARG( PlacesListBox, Selection ) mpDlg->RemovablePlaceSelected(); else mpDlg->RemovablePlaceSelected(false); - return 0; } IMPL_LINK_NOARG( PlacesListBox, DoubleClick ) diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index b7909e245077..998054601da0 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -74,7 +74,7 @@ class PlacesListBox : public Control Image getEntryIcon( PlacePtr pPlace ); - DECL_LINK( Selection, void* ); + DECL_LINK_TYPED( Selection, SvTreeListBox*, void ); DECL_LINK( DoubleClick, void* ); }; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 531ff3492f5c..90d522bc516d 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -1036,7 +1036,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectFilterHdl ) return 1; } -IMPL_LINK ( RemoteFilesDialog, TreeSelectHdl, FolderTree *, pBox ) +IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void ) { OUString* sURL = static_cast< OUString* >( pBox->GetHdlEntry()->GetUserData() ); @@ -1045,8 +1045,6 @@ IMPL_LINK ( RemoteFilesDialog, TreeSelectHdl, FolderTree *, pBox ) OpenURL( *sURL ); m_pFileView->GrabFocus(); } - - return 1; } IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void ) @@ -1323,7 +1321,7 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL ) m_pPath->SetURL( rURL ); - m_pTreeView->SetSelectHdl( Link<>() ); + m_pTreeView->SetSelectHdl( Link<SvTreeListBox*,void>() ); // read cached data for this url and fill the tree const ::std::vector< SvtContentEntry >& rFolders = m_pFileView->GetContent(); diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 008695b2d3c1..9f4791a158fc 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -199,7 +199,7 @@ private: DECL_LINK( SelectFilterHdl, void * ); - DECL_LINK( TreeSelectHdl, FolderTree * ); + DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void ); |