summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-08 09:54:16 +0200
committerNoel Grandin <noel@peralex.com>2015-09-09 10:06:11 +0200
commit5906a2a6380dc8f748a3c6f4fa0778e237abdff2 (patch)
tree0c3f41c74e68229b1633973d25e96a8896d6e450 /sd
parent7a39ae04220d70caef0335ed47452b36cd2e98c7 (diff)
convert Link<> to typed
Change-Id: I184d836e944d6dcfd17233a7a83680f1c1bff9bf
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/sdobjfac.hxx2
-rw-r--r--sd/source/core/sdobjfac.cxx6
2 files changed, 3 insertions, 5 deletions
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index cfca8b089f59..65e642a2410e 100644
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
@@ -34,7 +34,7 @@ protected:
public:
SdObjectFactory() {}
- DECL_LINK( MakeUserData, SdrObjFactory * );
+ DECL_LINK_TYPED( MakeUserData, SdrObjFactory *, void );
};
extern SdObjectFactory aSdObjectFactory;
diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx
index 90dbe551a17e..6a8b24d8dbe8 100644
--- a/sd/source/core/sdobjfac.cxx
+++ b/sd/source/core/sdobjfac.cxx
@@ -35,7 +35,7 @@ SdObjectFactory aSdObjectFactory;
|*
\************************************************************************/
-IMPL_LINK( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory )
+IMPL_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory, void )
{
if ( pObjFactory->nInventor == SdUDInventor )
{
@@ -55,12 +55,10 @@ IMPL_LINK( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory )
}
if ( pObjFactory->pNewData )
- return 0;
+ return;
if( aOldMakeUserDataLink.IsSet() )
aOldMakeUserDataLink.Call( this );
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */