diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-14 11:28:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-15 09:37:31 +0200 |
commit | e0714ae393661da231466ee679d1a6f5cd49fe35 (patch) | |
tree | 910be73c75f74d4c62dc881361b1a5a211a34c61 /svx | |
parent | 30350f72d8ce9d60ae6c47d602eff90f34bf71a9 (diff) |
convert Link<> to typed
Change-Id: I8f3e401afa27778678788b4ac90ea927a2fed1d7
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/galbrws2.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 6 | ||||
-rw-r--r-- | svx/source/dialog/contimp.hxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.cxx | 6 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 4 |
5 files changed, 7 insertions, 13 deletions
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 09223c05f6a2..a2f13805415d 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -140,7 +140,7 @@ private: DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void ); DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void ); - DECL_LINK( MiscHdl, void* ); + DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); private: diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 6e023967a9e0..f2d327cce33c 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -737,12 +737,10 @@ IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) return 0L; } -IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl) +IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void) { - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; m_pTbx1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 5f72e27d881b..9512e172f26e 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -92,7 +92,7 @@ class SvxSuperContourDlg : public SvxContourDlg DECL_LINK( PipetteHdl, ContourWindow* ); DECL_LINK( PipetteClickHdl, ContourWindow* ); DECL_LINK( WorkplaceClickHdl, ContourWindow* ); - DECL_LINK( MiscHdl, void* ); + DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); public: diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 0a75e7b2b444..3442f0d7b941 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -804,12 +804,10 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) } } -IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl) +IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) { - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); - - return 0L; } SvxIMapDlg* GetIMapDlg() diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index ce1e8323799b..f54a93443707 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -1331,7 +1331,7 @@ IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) SetMode( GALLERYBROWSERMODE_LIST ); } -IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) +IMPL_LINK_NOARG_TYPED(GalleryBrowser2, MiscHdl, LinkParamNone*, void) { maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() ); @@ -1351,8 +1351,6 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl) maViewBox->SetSizePixel( maViewBox->CalcWindowSizePixel() ); Resize(); - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |