diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-10-04 15:05:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-12 10:48:13 +0000 |
| commit | 3c99f8500f657ed84b316390d5175a6f5e56bc69 (patch) | |
| tree | 749f16652560a50d409b12a23bf1a5d93b3cd2d5 /vcl/generic | |
| parent | bbadb38539eb233ac45b267034066a7274181c65 (diff) | |
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/print/prtsetup.cxx | 20 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.hxx | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index ac21de6c06fa..6ba93da656a5 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -262,37 +262,36 @@ void RTSPaperPage::update() } } -IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox ) +IMPL_LINK_TYPED( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) { const PPDKey* pKey = NULL; - if( pBox == m_pPaperBox ) + if( &rBox == m_pPaperBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "PageSize" ) ); } - else if( pBox == m_pDuplexBox ) + else if( &rBox == m_pDuplexBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "Duplex" ) ); } - else if( pBox == m_pSlotBox ) + else if( &rBox == m_pSlotBox ) { if( m_pParent->m_aJobData.m_pParser ) pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "InputSlot" ) ); } - else if( pBox == m_pOrientBox ) + else if( &rBox == m_pOrientBox ) { m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; } if( pKey ) { - PPDValue* pValue = static_cast<PPDValue*>(pBox->GetSelectEntryData()); + PPDValue* pValue = static_cast<PPDValue*>(rBox.GetSelectEntryData()); m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue ); update(); } m_pParent->SetDataModified( true ); - return 0; } /* @@ -451,14 +450,14 @@ IMPL_LINK(RTSDevicePage, ModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox ) +IMPL_LINK_TYPED( RTSDevicePage, SelectHdl, ListBox&, rBox, void ) { - if( pBox == m_pPPDKeyBox ) + if( &rBox == m_pPPDKeyBox ) { const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectEntryData()); FillValueBox( pKey ); } - else if( pBox == m_pPPDValueBox ) + else if( &rBox == m_pPPDValueBox ) { const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectEntryData()); const PPDValue* pValue = static_cast<PPDValue*>(m_pPPDValueBox->GetSelectEntryData()); @@ -469,7 +468,6 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox ) } } m_pParent->SetDataModified( true ); - return 0; } void RTSDevicePage::FillValueBox( const PPDKey* pKey ) diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index 5e35f60ce57b..e1e60d55b535 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -89,7 +89,7 @@ class RTSPaperPage : public TabPage VclPtr<FixedText> m_pSlotText; VclPtr<ListBox> m_pSlotBox; - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK_TYPED( SelectHdl, ListBox&, void ); public: explicit RTSPaperPage( RTSDialog* ); virtual ~RTSPaperPage(); @@ -115,7 +115,7 @@ class RTSDevicePage : public TabPage void FillValueBox( const ::psp::PPDKey* ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK_TYPED( SelectHdl, ListBox&, void ); DECL_LINK( ModifyHdl, Edit* ); public: explicit RTSDevicePage( RTSDialog* ); |