From 3c99f8500f657ed84b316390d5175a6f5e56bc69 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 4 Oct 2015 15:05:38 +0200 Subject: convert Link<> to typed Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb Reviewed-on: https://gerrit.libreoffice.org/19305 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- vcl/generic/print/prtsetup.cxx | 20 +++++++++----------- vcl/generic/print/prtsetup.hxx | 4 ++-- vcl/inc/printdlg.hxx | 4 ++-- vcl/source/control/lstbox.cxx | 2 +- vcl/source/control/tabctrl.cxx | 3 +-- vcl/source/window/printdlg.cxx | 21 +++++++++------------ vcl/workben/svpclient.cxx | 5 ++--- 7 files changed, 26 insertions(+), 33 deletions(-) (limited to 'vcl') 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(pBox->GetSelectEntryData()); + PPDValue* pValue = static_cast(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(m_pPPDKeyBox->GetSelectEntryData()); FillValueBox( pKey ); } - else if( pBox == m_pPPDValueBox ) + else if( &rBox == m_pPPDValueBox ) { const PPDKey* pKey = static_cast(m_pPPDKeyBox->GetSelectEntryData()); const PPDValue* pValue = static_cast(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 m_pSlotText; VclPtr 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* ); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index a5f1769cd30c..853a822ee1ab 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -240,7 +240,7 @@ namespace vcl virtual void Command( const CommandEvent& ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK_TYPED( SelectHdl, ListBox&, void ); DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( ToggleHdl, CheckBox&, void ); DECL_LINK_TYPED( ToggleRadioHdl, RadioButton&, void ); @@ -248,7 +248,7 @@ namespace vcl DECL_LINK_TYPED( UIOption_CheckHdl, CheckBox&, void ); DECL_LINK_TYPED( UIOption_RadioHdl, RadioButton&, void ); - DECL_LINK( UIOption_SelectHdl, ListBox* ); + DECL_LINK_TYPED( UIOption_SelectHdl, ListBox&, void ); DECL_LINK( UIOption_ModifyHdl, Edit* ); public: diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 1ad96bb86b9e..b2998cac4051 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -961,7 +961,7 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt ) void ListBox::Select() { - ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_SELECT, [this] () { maSelectHdl.Call(this); } ); + ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_SELECT, [this] () { maSelectHdl.Call(*this); } ); } void ListBox::DoubleClick() diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index fb7798aa6258..1a725a30c818 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1002,10 +1002,9 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) return bRet; } -IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl) +IMPL_LINK_NOARG_TYPED(TabControl, ImplListBoxSelectHdl, ListBox&, void) { SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); - return 0; } IMPL_LINK_TYPED( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index b2185fcf070f..2b0996af513b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1517,11 +1517,11 @@ void PrintDialog::updateNup() preparePreview( true, true ); } -IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox ) +IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void ) { - if( pBox == maJobPage.mpPrinters ) + if( &rBox == maJobPage.mpPrinters ) { - OUString aNewPrinter( pBox->GetSelectEntry() ); + OUString aNewPrinter( rBox.GetSelectEntry() ); // set new printer maPController->setPrinter( VclPtrInstance( aNewPrinter ) ); maPController->resetPrinterOptions( maOptionsPage.mpToFileBox->IsChecked() ); @@ -1529,18 +1529,16 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox ) updatePrinterText(); preparePreview( true ); } - else if( pBox == maNUpPage.mpNupOrientationBox || pBox == maNUpPage.mpNupOrderBox ) + else if( &rBox == maNUpPage.mpNupOrientationBox || &rBox == maNUpPage.mpNupOrderBox ) { updateNup(); } - else if( pBox == maNUpPage.mpNupPagesBox ) + else if( &rBox == maNUpPage.mpNupPagesBox ) { if( !maNUpPage.mpPagesBtn->IsChecked() ) maNUpPage.mpPagesBtn->Check(); updateNupFromPages(); } - - return 0; } IMPL_LINK_TYPED( PrintDialog, ToggleRadioHdl, RadioButton&, rButton, void ) @@ -1796,14 +1794,14 @@ IMPL_LINK_TYPED( PrintDialog, UIOption_RadioHdl, RadioButton&, i_rBtn, void ) } } -IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox*, i_pBox ) +IMPL_LINK_TYPED( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) { - PropertyValue* pVal = getValueForWindow( i_pBox ); + PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) { - makeEnabled( i_pBox ); + makeEnabled( &i_rBox ); - sal_Int32 nVal( i_pBox->GetSelectEntryPos() ); + sal_Int32 nVal( i_rBox.GetSelectEntryPos() ); pVal->Value <<= nVal; //If we are in impress we start in print slides mode and get a @@ -1819,7 +1817,6 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox*, i_pBox ) // update preview and page settings preparePreview(); } - return 0; } IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox ) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index ee22e6062336..b044f0ed53c3 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -114,7 +114,7 @@ public: static OString processCommand( const OString& rCommand ); DECL_LINK_TYPED( ListHdl, Button*, void ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK_TYPED( SelectHdl, ListBox&, void ); DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void ); }; @@ -240,7 +240,7 @@ IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void) processCommand( "quit" ); } -IMPL_LINK( MyWin, SelectHdl, ListBox*, ) +IMPL_LINK_NOARG_TYPED( MyWin, SelectHdl, ListBox&, void) { OUString aEntry = m_aSvpBitmaps->GetSelectEntry(); sal_Int32 nPos = aEntry.indexOf( ": " ); @@ -267,7 +267,6 @@ IMPL_LINK( MyWin, SelectHdl, ListBox*, ) m_aImage->SetSizePixel( aFixedSize ); m_aImage->SetImage( Image( BitmapEx( aBitmap ) ) ); } - return 0; } void MyWin::MouseMove( const MouseEvent& rMEvt ) -- cgit v1.2.3