diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/svtools/transfer.hxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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/transfer.hxx')
-rw-r--r-- | include/svtools/transfer.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index de0d85c1c1c3..0c86721d7cd5 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -23,6 +23,7 @@ #include <svtools/svtdllapi.h> #include <tools/globname.hxx> #include <tools/gen.hxx> +#include <tools/link.hxx> #include <sot/formats.hxx> #include <sot/storage.hxx> #include <cppuhelper/implbase1.hxx> @@ -49,7 +50,6 @@ class INetBookmark; class INetImage; class FileList; namespace vcl { class Window; } -class Link; // Drag&Drop defines @@ -517,7 +517,7 @@ public: using TransferableHelper::StartDrag; void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, - const Link& rCallbck, + const Link<>& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); }; |