diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /dbaccess/source/ui/dlg/indexfieldscontrol.cxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff) |
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the
Link class can be updated over time.
All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).
(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)
Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'dbaccess/source/ui/dlg/indexfieldscontrol.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a236e46ea7dc..67e2811d6848 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -40,8 +40,8 @@ namespace dbaui class DbaMouseDownListBoxController : public ListBoxCellController { protected: - Link m_aOriginalModifyHdl; - Link m_aAdditionalModifyHdl; + Link<> m_aOriginalModifyHdl; + Link<> m_aAdditionalModifyHdl; public: DbaMouseDownListBoxController(ListBoxControl* _pParent) @@ -49,24 +49,24 @@ namespace dbaui { } - void SetAdditionalModifyHdl(const Link& _rHdl); + void SetAdditionalModifyHdl(const Link<>& _rHdl); protected: virtual bool WantMouseEvent() const SAL_OVERRIDE { return true; } - virtual void SetModifyHdl(const Link& _rHdl) SAL_OVERRIDE; + virtual void SetModifyHdl(const Link<>& _rHdl) SAL_OVERRIDE; private: void implCheckLinks(); DECL_LINK( OnMultiplexModify, void* ); }; - void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link& _rHdl) + void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<>& _rHdl) { m_aAdditionalModifyHdl = _rHdl; implCheckLinks(); } - void DbaMouseDownListBoxController::SetModifyHdl(const Link& _rHdl) + void DbaMouseDownListBoxController::SetModifyHdl(const Link<>& _rHdl) { m_aOriginalModifyHdl = _rHdl; implCheckLinks(); @@ -86,7 +86,7 @@ namespace dbaui if (m_aAdditionalModifyHdl.IsSet() || m_aOriginalModifyHdl.IsSet()) ListBoxCellController::SetModifyHdl(LINK(this, DbaMouseDownListBoxController, OnMultiplexModify)); else - ListBoxCellController::SetModifyHdl(Link()); + ListBoxCellController::SetModifyHdl(Link<>()); } // IndexFieldsControl |