summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr/browserview.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/browserview.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/browserview.hxx')
-rw-r--r--extensions/source/propctrlr/browserview.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 9ae97d364295..59e687149a89 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -39,7 +39,7 @@ namespace pcr
{
VclPtr<OPropertyEditor> m_pPropBox;
sal_uInt16 m_nActivePage;
- Link m_aPageActivationHandler;
+ Link<> m_aPageActivationHandler;
protected:
virtual void Resize() SAL_OVERRIDE;
@@ -58,8 +58,8 @@ namespace pcr
sal_uInt16 getActivaPage() const { return m_nActivePage; }
void activatePage(sal_uInt16 _nPage);
- void setPageActivationHandler(const Link& _rHdl) { m_aPageActivationHandler = _rHdl; }
- Link getPageActivationHandler() const { return m_aPageActivationHandler; }
+ void setPageActivationHandler(const Link<>& _rHdl) { m_aPageActivationHandler = _rHdl; }
+ Link<> getPageActivationHandler() const { return m_aPageActivationHandler; }
::com::sun::star::awt::Size getMinimumSize();