summaryrefslogtreecommitdiff
path: root/include/svtools/inettbc.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 /include/svtools/inettbc.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 'include/svtools/inettbc.hxx')
-rw-r--r--include/svtools/inettbc.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 35a0893ec09f..47217f27e8f8 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -32,7 +32,7 @@ class SVT_DLLPUBLIC SvtURLBox : public ComboBox
{
friend class SvtMatchContext_Impl;
friend class SvtURLBox_Impl;
- Link aOpenHdl;
+ Link<> aOpenHdl;
OUString aBaseURL;
OUString aPlaceHolder;
rtl::Reference< SvtMatchContext_Impl > pCtx;
@@ -67,8 +67,8 @@ public:
void SetBaseURL( const OUString& rURL );
const OUString& GetBaseURL() const { return aBaseURL; }
- void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
- const Link& GetOpenHdl() const { return aOpenHdl; }
+ void SetOpenHdl( const Link<>& rLink ) { aOpenHdl = rLink; }
+ const Link<>& GetOpenHdl() const { return aOpenHdl; }
void SetOnlyDirectories( bool bDir = true );
void SetNoURLSelection( bool bSet = true );
INetProtocol GetSmartProtocol() const { return eSmartProtocol; }