diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-11 18:18:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-11 18:46:40 +0200 |
| commit | 01a4dba8e9a43791d4f472d6c473398aee5034fe (patch) | |
| tree | cfa3d4c9cd61fe83d0ff15d653c5b116ac497c2f /svx | |
| parent | 9cce3ad91f9bcd784e570561ce4bf2155e06cbbc (diff) | |
SdrObjCustomShape::GetCustomShapeEngine: aEngine can't be empty at this point
Change-Id: I7c656c461ab6bdf53d14ec5804ac82e219c0aef1
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index c08039fc4070..8f7b0e2e5166 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -419,17 +419,14 @@ Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const Reference< XShape > aXShape = GetXShapeForSdrObject(const_cast<SdrObjCustomShape*>(this)); if ( aXShape.is() ) { - if ( !aEngine.isEmpty() ) - { - Sequence< Any > aArgument( 1 ); - Sequence< PropertyValue > aPropValues( 1 ); - aPropValues[ 0 ].Name = "CustomShape"; - aPropValues[ 0 ].Value <<= aXShape; - aArgument[ 0 ] <<= aPropValues; - Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) ); - if ( xInterface.is() ) - mxCustomShapeEngine = Reference< XCustomShapeEngine >( xInterface, UNO_QUERY ); - } + Sequence< Any > aArgument( 1 ); + Sequence< PropertyValue > aPropValues( 1 ); + aPropValues[ 0 ].Name = "CustomShape"; + aPropValues[ 0 ].Value <<= aXShape; + aArgument[ 0 ] <<= aPropValues; + Reference< XInterface > xInterface( xContext->getServiceManager()->createInstanceWithArgumentsAndContext( aEngine, aArgument, xContext ) ); + if ( xInterface.is() ) + mxCustomShapeEngine = Reference< XCustomShapeEngine >( xInterface, UNO_QUERY ); } return mxCustomShapeEngine; |