diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-17 13:01:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 14:41:58 +0200 |
| commit | 2d9e314c0925a73f6bc876e06d798184ed028416 (patch) | |
| tree | 65d76374e459ebe4158cddf75a0aef0ede5c6b1c /sd | |
| parent | 6048935ff4c7cedf3aa288b9a28058c07be250c5 (diff) | |
remove unused Link<> fields
Change-Id: Ifad5e3646a519c2dd41ff62b798ebd0811377e5e
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sdobjfac.hxx | 6 | ||||
| -rw-r--r-- | sd/source/core/sdobjfac.cxx | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx index 65e642a2410e..5adbc68fdbb9 100644 --- a/sd/inc/sdobjfac.hxx +++ b/sd/inc/sdobjfac.hxx @@ -27,14 +27,10 @@ class SdrObjFactory; class SdObjectFactory { -protected: - Link<> aOldMakeObjLink; - Link<> aOldMakeUserDataLink; - public: SdObjectFactory() {} - DECL_LINK_TYPED( MakeUserData, SdrObjFactory *, void ); + DECL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, void ); }; extern SdObjectFactory aSdObjectFactory; diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx index 6a8b24d8dbe8..b25c4b8c8f02 100644 --- a/sd/source/core/sdobjfac.cxx +++ b/sd/source/core/sdobjfac.cxx @@ -35,7 +35,7 @@ SdObjectFactory aSdObjectFactory; |* \************************************************************************/ -IMPL_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory, void ) +IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory, void ) { if ( pObjFactory->nInventor == SdUDInventor ) { @@ -53,12 +53,6 @@ IMPL_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjFactory *, pObjFactory, vo break; } } - - if ( pObjFactory->pNewData ) - return; - - if( aOldMakeUserDataLink.IsSet() ) - aOldMakeUserDataLink.Call( this ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |