diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/dobjfac.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/draw/dobjfac.cxx | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index 52fb8bc6773d..5bcc3108c842 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -26,7 +26,7 @@ class SdrObjFactory; class SwObjectFactory { public: - DECL_STATIC_LINK_TYPED( SwObjectFactory, MakeObject, SdrObjFactory *, void ); + DECL_STATIC_LINK_TYPED( SwObjectFactory, MakeObject, SdrObjCreatorParams, SdrObject* ); }; extern SwObjectFactory aSwObjectFactory; diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx index 25d96fbe0d91..845c08617195 100644 --- a/sw/source/core/draw/dobjfac.cxx +++ b/sw/source/core/draw/dobjfac.cxx @@ -24,15 +24,16 @@ SwObjectFactory aSwObjectFactory; IMPL_STATIC_LINK_TYPED( - SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory, void ) + SwObjectFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { - if ( pObjFactory->nInventor == SWGInventor ) + if ( aParams.nInventor == SWGInventor ) { // No switch, there's only one at the moment - OSL_ENSURE( pObjFactory->nIdentifier == SwFlyDrawObjIdentifier, + OSL_ENSURE( aParams.nObjIdentifier == SwFlyDrawObjIdentifier, "Wrong inventor or identifier" ); - pObjFactory->pNewObj = new SwFlyDrawObj(); + return new SwFlyDrawObj; } + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |