diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-21 10:43:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-22 20:21:55 +0200 |
| commit | 1c061348aa573967132349736675f81bcf5e46af (patch) | |
| tree | 33fe1a51b1f03499469b5f5339b812efac047845 /sd/source/ui | |
| parent | ba6cbddd8890b3a5693a187b32c9b92a67511f3d (diff) | |
convert Link<> to typed
and drop an unused parameter
Change-Id: I2f3bc15e4168103a6cb2d19807d291d8da24387e
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/dlg/vectdlg.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/inc/vectdlg.hxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 82533c206171..c856505e005c 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -158,7 +158,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf ) if( !!aTmp ) { - const Link<> aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) ); + const Link<long,void> aPrgsHdl( LINK( this, SdVectorizeDlg, ProgressHdl ) ); aTmp.Vectorize( rMtf, (sal_uInt8) m_pMtReduce->GetValue(), BmpVectorizeFlags::Outer | BmpVectorizeFlags::ReduceEdges, &aPrgsHdl ); if( m_pCbFillHoles->IsChecked() ) @@ -260,10 +260,9 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, rMtf.AddAction( new MetaRectAction( aRect ) ); } -IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) +IMPL_LINK_TYPED( SdVectorizeDlg, ProgressHdl, long, nData, void ) { - m_pPrgs->SetValue( (sal_uInt16)reinterpret_cast<sal_uLong>(pData) ); - return 0L; + m_pPrgs->SetValue( (sal_uInt16)nData ); } IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickPreviewHdl, Button*, void) diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 13997a79379f..944a1b2ec0b8 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -72,7 +72,7 @@ class SdVectorizeDlg : public ModalDialog void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf, long nPosX, long nPosY, long nWidth, long nHeight ); - DECL_LINK( ProgressHdl, void* ); + DECL_LINK_TYPED( ProgressHdl, long, void ); DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); DECL_LINK_TYPED( ClickOKHdl, Button*, void ); DECL_LINK_TYPED( ToggleHdl, CheckBox&, void ); |