diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-19 09:11:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-26 11:15:35 +0200 |
| commit | 167bc621ef825ed5b961502fe9324a675ee34e42 (patch) | |
| tree | 523838d8adc14a62f846529ee6eab3343b2fe87b /vcl/generic | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 5 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.cxx | 4 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.hxx | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 8c1a10a82c26..576a24fe27f1 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -97,7 +97,7 @@ namespace VclPtr<Edit> m_pEdit; OUString& m_rReturnValue; - DECL_LINK( ClickBtnHdl, Button* ); + DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); public: // parent window, Query text, initial value @@ -130,7 +130,7 @@ namespace SetText(rQuery); } - IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton ) + IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void ) { if (pButton == m_pOKButton) { @@ -139,7 +139,6 @@ namespace } else EndDialog(); - return 0; } int QueryFaxNumber(OUString& rNumber) diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index 8e2799cca27f..8e06a6f3a54a 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -133,7 +133,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl ) return 0; } -IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) +IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void ) { if( pButton == m_pOKButton ) { @@ -155,8 +155,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) } else if( pButton == m_pCancelButton ) EndDialog(); - - return 0; } /* diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index 766237e5e25c..a9da270408cc 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -59,7 +59,7 @@ class RTSDialog : public TabDialog bool mbDataModified; DECL_LINK( ActivatePage, TabControl* ); - DECL_LINK( ClickButton, Button* ); + DECL_LINK_TYPED( ClickButton, Button*, void ); // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); |