summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr/standardcontrol.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /extensions/source/propctrlr/standardcontrol.hxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'extensions/source/propctrlr/standardcontrol.hxx')
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 9eb99354abda..aa8e6aff5fd9 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -63,7 +63,7 @@ namespace pcr
{
}
- void SetModifyHdl( const Link& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
+ void SetModifyHdl( const Link<>& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
protected:
bool PreNotify( NotifyEvent& _rNEvt );
@@ -166,7 +166,7 @@ namespace pcr
{
private:
Point m_aMouseButtonDownPos;
- Link m_aClickHandler;
+ Link<> m_aClickHandler;
public:
HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle );
@@ -174,8 +174,8 @@ namespace pcr
/** sets the handler which will (asynchronously, with locked SolarMutex) be called
when the hyperlink has been clicked by the user
*/
- void SetClickHdl( const Link& _rHdl ) { m_aClickHandler = _rHdl; }
- const Link& GetClickHdl( ) const { return m_aClickHandler; }
+ void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; }
+ const Link<>& GetClickHdl( ) const { return m_aClickHandler; }
protected:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;