summaryrefslogtreecommitdiff
path: root/sw/source/uibase/uiview
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 /sw/source/uibase/uiview
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 'sw/source/uibase/uiview')
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 93853c2f41a7..3ede0e371744 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -238,7 +238,7 @@ void SwView_Impl::AddTransferable(SwTransferable& rTransferable)
rTransferable.m_refCount--;
}
-void SwView_Impl::StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl )
+void SwView_Impl::StartDocumentInserter( const OUString& rFactory, const Link<>& rEndDialogHdl )
{
delete m_pDocInserter;
m_pDocInserter = new ::sfx2::DocumentInserter( rFactory );
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index add57844f094..51e037600da4 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -736,7 +736,7 @@ bool SwView::ExecDrwTxtSpellPopup(const Point& rPt)
if (pOLV->IsWrongSpelledWordAtPos( aPos ))
{
bRet = true;
- Link aLink = LINK(this, SwView, OnlineSpellCallback);
+ Link<> aLink = LINK(this, SwView, OnlineSpellCallback);
pOLV->ExecuteSpellPopup( aPos,&aLink );
}
return bRet;