summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/fileobj.cxx
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 /sfx2/source/appl/fileobj.cxx
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 'sfx2/source/appl/fileobj.cxx')
-rw-r--r--sfx2/source/appl/fileobj.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 278034ceee0c..deaedf5876f6 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -68,7 +68,7 @@ SvFileObject::~SvFileObject()
{
if (xMed.Is())
{
- xMed->SetDoneLink( Link() );
+ xMed->SetDoneLink( Link<>() );
xMed.Clear();
}
if (nPostUserEventId)
@@ -392,7 +392,7 @@ OUString impl_getFilter( const OUString& _rURL )
return sFilter;
}
-void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl )
+void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link<>& rEndEditHdl )
{
aEndEditLink = rEndEditHdl;
OUString sFile, sRange, sTmpFilter;
@@ -485,7 +485,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
pThis->bLoadAgain = true;
if( pThis->xMed.Is() )
{
- pThis->xMed->SetDoneLink( Link() );
+ pThis->xMed->SetDoneLink( Link<>() );
pThis->pDelMed = new SfxMediumRef(pThis->xMed);
pThis->nPostUserEventId = Application::PostUserEvent(
LINK( pThis, SvFileObject, DelMedium_Impl ),