From 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 30 Apr 2015 10:20:00 +0200 Subject: 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 --- reportdesign/source/ui/inc/AddField.hxx | 4 ++-- reportdesign/source/ui/inc/ColorListener.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 7685b447fef6..b547b33c8fff 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -61,7 +61,7 @@ class OAddFieldWindow :public FloatingWindow VclPtr m_aHelpText; VclPtr m_aInsertButton; - Link m_aCreateLink; + Link<> m_aCreateLink; OUString m_aCommandName; OUString m_sFilter; sal_Int32 m_nCommandType; @@ -88,7 +88,7 @@ public: inline const OUString& GetCommand() const { return m_aCommandName; } inline sal_Int32 GetCommandType() const { return m_nCommandType; } inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; } - inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; } + inline void SetCreateHdl(const Link<>& _aCreateLink) { m_aCreateLink = _aCreateLink; } inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const { return m_xColumns; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const; diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index c0ebffb83922..b3eeca1021bc 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -33,7 +33,7 @@ namespace rptui void operator =(const OColorListener&) SAL_DELETED_FUNCTION; protected: OModuleClient m_aModuleClient; - Link m_aCollapsedLink; + Link<> m_aCollapsedLink; svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; OUString m_sColorEntry; @@ -63,7 +63,7 @@ namespace rptui */ inline bool isMarked() const { return m_bMarked; } - inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; } + inline void setCollapsedHdl(const Link<>& _aLink ){ m_aCollapsedLink = _aLink; } inline bool isCollapsed() const { return m_bCollapsed; } /** collapse or expand -- cgit