diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-02-04 10:22:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-04 11:19:35 +0100 |
| commit | 18982376918c88ec09c2c7fd42ef635e93897b05 (patch) | |
| tree | 33745acca3f3b8155628981b81438a15131fc157 /oox | |
| parent | 380ab85b6594a013f34f5e6ec69fb569336bbb48 (diff) | |
use more getSdrObjectFromXShape
Change-Id: Ia237643ab040425f231f781c86e7e060f0b53717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110400
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 38c5ddfa689f..b4ce27ea4df4 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -580,21 +580,21 @@ static void lcl_createPresetShape(const uno::Reference<drawing::XShape>& xShape, if (pParagraph->getProperties().getParaAdjust()) eAdjust = *pParagraph->getProperties().getParaAdjust(); xSet->setPropertyValue( "ParaAdjust", uno::makeAny( eAdjust ) ); - SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape ); + SdrObject* pShape = SdrObject::getSdrObjectFromXShape( xShape ); assert(pShape); SdrTextHorzAdjust eHorzAdjust = lcl_convertAdjust( eAdjust ); - pShape->GetSdrObject()->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) ); + pShape->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) ); } } // Apply vertical adjustment for text on arc // ToDo: The property is currently not evaluated. - SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>(xShape); + SdrObject* pShape = SdrObject::getSdrObjectFromXShape(xShape); assert(pShape); if (rClass == "fontwork-arch-up-curve") - pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ) ); + pShape->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_BOTTOM ) ); else if (rClass == "fontwork-arch-down-curve") - pShape->GetSdrObject()->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ) ); + pShape->SetMergedItem( SdrTextVertAdjustItem( SdrTextVertAdjust::SDRTEXTVERTADJUST_TOP ) ); // Apply preset shape xDefaulter->createCustomShapeDefaults( rClass ); |