summaryrefslogtreecommitdiffstats
path: root/toolkit
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 /toolkit
parentwriterfilter: unused fill and CT_Fill resources (diff)
downloadcore-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.tar.gz
core-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.zip
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 'toolkit')
-rw-r--r--toolkit/source/awt/scrollabledialog.cxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx
index bcb508c8c06e..08c72bb8c92c 100644
--- a/toolkit/source/awt/scrollabledialog.cxx
+++ b/toolkit/source/awt/scrollabledialog.cxx
@@ -39,7 +39,7 @@ ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle )
mbHasVertBar( false ),
maScrollVis( None )
{
- Link aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
+ Link<> aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) );
maVScrollBar->SetScrollHdl( aLink );
maHScrollBar->SetScrollHdl( aLink );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 50106d844729..05b233013916 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -159,8 +159,8 @@ class VCLXToolkit : public VCLXToolkit_Impl,
::cppu::OInterfaceContainerHelper m_aTopWindowListeners;
::cppu::OInterfaceContainerHelper m_aKeyHandlers;
::cppu::OInterfaceContainerHelper m_aFocusListeners;
- ::Link m_aEventListenerLink;
- ::Link m_aKeyListenerLink;
+ ::Link<> m_aEventListenerLink;
+ ::Link<> m_aKeyListenerLink;
bool m_bEventListener;
bool m_bKeyListener;