diff options
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/fileview.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/contnr/fileview.cxx | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 7872042d8e3d..a482e9b0e17e 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1614,7 +1614,7 @@ IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl) -IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) +IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) { OUString sCurrentFolder( pView->GetViewURL() ); // check if we can create new folders @@ -1632,8 +1632,6 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) aCurrentFolder.removeSegment(); } EnableControl( _pImp->_pBtnUp, bCanTravelUp ); - - return 0; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 5d1c3dc648e0..f214c3d394e9 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -123,7 +123,7 @@ private: DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( DblClickHdl_Impl, SvTreeListBox*, bool); DECL_LINK(EntrySelectHdl_Impl, void *); - DECL_LINK( OpenDoneHdl_Impl, SvtFileView* ); + DECL_LINK_TYPED( OpenDoneHdl_Impl, SvtFileView*, void ); DECL_LINK_TYPED( AutoExtensionHdl_Impl, Button*, void); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( PlayButtonHdl_Impl, Button*, void); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index c57ed40f8079..4070e4a56078 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -160,7 +160,7 @@ public: void SetSelectHdl( const Link<SvTreeListBox*,void>& rHdl ); void SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl ); - void SetOpenDoneHdl( const Link<>& rHdl ); + void SetOpenDoneHdl( const Link<SvtFileView*,void>& rHdl ); sal_uLong GetSelectionCount() const; SvTreeListEntry* FirstSelected() const; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index b4ab6a684645..2f4ef7bcf5f2 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -370,7 +370,7 @@ public: OUString maAllFilter; OUString maCurrentFilter; Image maFolderImage; - Link<> maOpenDoneLink; + Link<SvtFileView*,void> maOpenDoneLink; Reference< XCommandEnvironment > mxCmdEnv; SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv, @@ -1286,7 +1286,7 @@ const OUString& SvtFileView::GetViewURL() const return mpImp->maViewURL; } -void SvtFileView::SetOpenDoneHdl( const Link<>& rHdl ) +void SvtFileView::SetOpenDoneHdl( const Link<SvtFileView*,void>& rHdl ) { mpImp->maOpenDoneLink = rHdl; } |