diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-02 09:20:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 07:20:27 +0000 |
| commit | 5beffcf3f1fd96fb9909b93759f8537417048863 (patch) | |
| tree | 4c3818fa030c9b5f99a7abd3a39b68945a0c41e3 /sd | |
| parent | 84945163ab6496d22ca814880cfd14ceb33c5f14 (diff) | |
convert Link<> to typed
Change-Id: Ic0482dc5ed26eb2fc6ccde73022eff8b4786de83
Reviewed-on: https://gerrit.libreoffice.org/18258
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/headerfooterdlg.hxx | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index db86cd5d31ff..169c774f01af 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -589,11 +589,10 @@ double CustomAnimationCreateDialog::getSelectedDuration() const return getCurrentPage()->getDuration(); } -IMPL_LINK_NOARG(CustomAnimationCreateDialog, implActivatePagekHdl) +IMPL_LINK_NOARG_TYPED(CustomAnimationCreateDialog, implActivatePagekHdl, TabControl*, void) { getCurrentPage()->setDuration( mfDuration ); getCurrentPage()->setIsPreview( mbIsPreview ); - return 1; } IMPL_LINK_NOARG_TYPED(CustomAnimationCreateDialog, implDeactivatePagekHdl, TabControl *, bool) diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index 9b8ec8585607..4ad4d5932c46 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -53,8 +53,8 @@ private: void setPosition(); void storePosition(); - DECL_LINK(implActivatePagekHdl, void *); - DECL_LINK_TYPED(implDeactivatePagekHdl, TabControl *, bool); + DECL_LINK_TYPED(implActivatePagekHdl, TabControl*, void); + DECL_LINK_TYPED(implDeactivatePagekHdl, TabControl*, bool); private: VclPtr<CustomAnimationPane> mpPane; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 79ce991a6dbd..9a9c382e4412 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -255,15 +255,13 @@ void HeaderFooterDialog::dispose() TabDialog::dispose(); } -IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) +IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) { const sal_uInt16 nId = pTabCtrl->GetCurPageId(); TabPage* pTabPage = pTabCtrl->GetTabPage( nId ); pTabPage->Show(); maPBApply->Show( nId == mnSlidesId ); maPBApply->Enable( mpCurrentPage != NULL ); - - return 0; } IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void) diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 8a1d4fd5c7f9..f6161c58ec3b 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -37,7 +37,7 @@ class HeaderFooterTabPage; class HeaderFooterDialog : public TabDialog { private: - DECL_LINK( ActivatePageHdl, TabControl * ); + DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void ); DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void ); DECL_LINK_TYPED( ClickApplyHdl, Button*, void ); DECL_LINK_TYPED( ClickCancelHdl, Button*, void ); |