diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-16 15:03:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-19 09:05:57 +0200 |
commit | 137208746e05941d06d931e4d0446011c6faad03 (patch) | |
tree | 4b00a64e383288721e4af8b94636410c4051f6c0 | |
parent | 72f5baa8b70b2e31af2078cd647064eaf30795b6 (diff) |
convert Link<> to typed
Change-Id: I8c00bcdb718bcebbb15e24e1c1622cdc6b356787
-rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 9 | ||||
-rw-r--r-- | extensions/source/propctrlr/formlinkdialog.hxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 246a25f52e82..ae44fc5e4810 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -69,14 +69,14 @@ namespace pcr VclPtr<ComboBox> m_pDetailColumn; VclPtr<ComboBox> m_pMasterColumn; - Link<> m_aLinkChangeHandler; + Link<FieldLinkRow&,void> m_aLinkChangeHandler; public: explicit FieldLinkRow( vcl::Window* _pParent ); virtual ~FieldLinkRow(); virtual void dispose() override; - inline void SetLinkChangeHandler( const Link<>& _rHdl ) { m_aLinkChangeHandler = _rHdl; } + inline void SetLinkChangeHandler( const Link<FieldLinkRow&,void>& _rHdl ) { m_aLinkChangeHandler = _rHdl; } enum LinkParticipant { @@ -149,7 +149,7 @@ namespace pcr IMPL_LINK_NOARG_TYPED( FieldLinkRow, OnFieldNameChanged, Edit&, void ) { - m_aLinkChangeHandler.Call( this ); + m_aLinkChangeHandler.Call( *this ); } VCL_BUILDER_FACTORY(FieldLinkRow) @@ -663,10 +663,9 @@ namespace pcr } - IMPL_LINK( FormLinkDialog, OnFieldChanged, FieldLinkRow*, /*_pRow*/ ) + IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnFieldChanged, FieldLinkRow&, void ) { updateOkButton(); - return 0L; } diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 21699d19aab2..b341cd0f6865 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -87,7 +87,7 @@ namespace pcr private: DECL_LINK_TYPED( OnSuggest, Button*, void ); - DECL_LINK( OnFieldChanged, FieldLinkRow* ); + DECL_LINK_TYPED( OnFieldChanged, FieldLinkRow&, void ); DECL_LINK_TYPED( OnInitialize, void*, void); void updateOkButton(); |