diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-22 11:02:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-23 09:54:16 +0200 |
| commit | ba263e124ce263c3c893542062d9c473f5aae589 (patch) | |
| tree | 74b99db819c66eb333ab2188df0a65a0b7b8fc2e /sd | |
| parent | 962719df881a8aefdec7f564293d1e0cd42a5540 (diff) | |
clean up the SdrObjFactory create callbacks
passing params by setting fields on yourself is just gross
Change-Id: Iee98a9e8e266b56fc886c76eab470ab1ff7ff8e4
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sdobjfac.hxx | 3 | ||||
| -rw-r--r-- | sd/source/core/sdobjfac.cxx | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index 5adbc68fdbb9..de130a2c4c2a 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -22,7 +22,6 @@ #include <tools/link.hxx> -// class SdObjectFactory class SdrObjFactory; class SdObjectFactory @@ -30,7 +29,7 @@ class SdObjectFactory public: SdObjectFactory() {} - DECL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, void ); + DECL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* ); }; extern SdObjectFactory aSdObjectFactory; diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index 5d2c7bf1a0b5..193a15bfb09d 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -35,24 +35,25 @@ SdObjectFactory aSdObjectFactory; |* \************************************************************************/ -IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory, void ) +IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { - if ( pObjFactory->nInventor == SdUDInventor ) + if ( aParams.nInventor == SdUDInventor ) { - switch( pObjFactory->nIdentifier ) + switch( aParams.nObjIdentifier ) { case SD_ANIMATIONINFO_ID: - pObjFactory->pNewData = new SdAnimationInfo( *pObjFactory->pObj ); + return new SdAnimationInfo( *aParams.pObject ); break; case SD_IMAPINFO_ID: - pObjFactory->pNewData = new SdIMapInfo; + return new SdIMapInfo; break; default: break; } } + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |