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/editeng/editview.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/editeng/editview.hxx')
-rw-r--r-- | include/editeng/editview.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index aec7f03c9939..bb091172c9ba 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -26,6 +26,7 @@ #include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <tools/gen.hxx> +#include <tools/link.hxx> #include <vcl/cursor.hxx> #include <editeng/editstat.hxx> #include <svl/languageoptions.hxx> @@ -44,7 +45,6 @@ class MouseEvent; class DropEvent; class CommandEvent; class Rectangle; -class Link; class Pair; class Point; class Range; @@ -213,7 +213,7 @@ public: bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); bool IsShapeParaFocusable(); bool WrongSpelledBreakPara(sal_Int32 nPara, sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex); - void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); + void ExecuteSpellPopup( const Point& rPosPixel, Link<>* pCallBack = 0 ); void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; |