diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-13 11:10:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-14 09:30:20 +0200 |
| commit | b4da5037e0cc2952446b2138d515e0c762172b25 (patch) | |
| tree | 061c81fb860f5552ce18051d7eb86f4f5324da61 /cui/source/factory | |
| parent | 73ceffe5c247dcffa7653e043530e58e4eb73fdf (diff) | |
convert Link<> to typed
Change-Id: I1876f327607e0e23292950741df348d4ec31fde1
Diffstat (limited to 'cui/source/factory')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 12 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8069f073f5d2..91336b4bf68e 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -149,7 +149,7 @@ VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl() } // virtual -void VclAbstractDialog2_Impl::StartExecuteModal( const Link<>& rEndDialogHdl ) +void VclAbstractDialog2_Impl::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) { m_aEndDlgHdl = rEndDialogHdl; m_pDlg->StartExecuteModal( @@ -162,17 +162,15 @@ long VclAbstractDialog2_Impl::GetResult() return m_pDlg->GetResult(); } -IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg ) +IMPL_LINK_TYPED( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void ) { - if ( pDlg != m_pDlg ) + if ( &rDlg != m_pDlg ) { SAL_WARN( "cui.factory", "VclAbstractDialog2_Impl::EndDialogHdl(): wrong dialog" ); } - m_aEndDlgHdl.Call( this ); - m_aEndDlgHdl = Link<>(); - - return 0L; + m_aEndDlgHdl.Call( *m_pDlg ); + m_aEndDlgHdl = Link<Dialog&,void>(); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 1bb596dd21d8..39b645d1d58f 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -78,14 +78,14 @@ short Class::Execute() \ class VclAbstractDialog2_Impl : public VclAbstractDialog2 { ScopedVclPtr<Dialog> m_pDlg; - Link<> m_aEndDlgHdl; + Link<Dialog&,void> m_aEndDlgHdl; public: explicit VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {} virtual ~VclAbstractDialog2_Impl(); - virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) override; + virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; virtual long GetResult() override; private: - DECL_LINK( EndDialogHdl, Dialog* ); + DECL_LINK_TYPED( EndDialogHdl, Dialog&, void ); }; class CuiVclAbstractDialog_Impl : public VclAbstractDialog |