diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 07:23:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 08:10:11 +0000 |
| commit | be73c1602dbe4d0f09d0e9c4853ec89df3eb37ad (patch) | |
| tree | 90fea0177273fd5a9499fa66e84f3316de3fe6d7 /sw | |
| parent | 61afb4bebafe6e615611e74b17ce0fc43648813f (diff) | |
convert Link<> to typed
Change-Id: I3127752785b77672d37f99bc9eaa881377dabe7c
Reviewed-on: https://gerrit.libreoffice.org/18431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/view.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/navipi.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/viewling.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 3892e4086246..30084850c702 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -270,7 +270,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void ); - DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( FieldPopupModeEndHdl, FloatingWindow*, void ); inline long GetXScroll() const; inline long GetYScroll() const; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 6d39178bca87..09548599edbf 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -110,7 +110,7 @@ class SwNavigationPI : public vcl::Window, DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); DECL_LINK_TYPED( ChangePageHdl, Idle*, void ); DECL_LINK( PageEditModifyHdl, void* ); - DECL_LINK( PopupModeEndHdl, void * ); + DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void ); void UsePage(SwWrtShell *); diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 896d240acbe9..e48622ce3292 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -907,10 +907,9 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox ) return res; } -IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl) +IMPL_LINK_NOARG_TYPED(SwView, FieldPopupModeEndHdl, FloatingWindow*, void) { m_pFieldPopup.disposeAndClear(); - return 0; } void SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM ) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 68b81fbb0c6f..97b1b9c44dce 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -888,7 +888,7 @@ void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow ) pPopupWindow->SetDeleteLink_Impl( LINK( this, SwNavigationPI, ClosePopupWindow )); } -IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl) +IMPL_LINK_NOARG_TYPED(SwNavigationPI, PopupModeEndHdl, FloatingWindow*, void) { if ( pPopupWindow->IsVisible() ) { @@ -904,8 +904,6 @@ IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl) // will destroy itself. pPopupWindow = 0; } - - return 1; } IMPL_LINK_TYPED( SwNavigationPI, ClosePopupWindow, SfxPopupWindow *, pWindow, void ) |