diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-06-01 23:04:00 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-06-04 13:34:56 +0200 |
| commit | 9da9d3054ab14cde2518cf9de8f7d8455800e551 (patch) | |
| tree | a5bccea028ea81d5bb23d1d97214226cb34ed009 /oox | |
| parent | 4927143b6652ce2d19e6f476923112f0ab7fc273 (diff) | |
Use "Radius" instead of "Rad" for new properties
Change-Id: Ifd232bccf1519e0ed68195cf4344893175a675e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95331
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 7313ed6a5b63e06ddd8ce90c3b5b2f168743a2c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95322
Tested-by: Jenkins
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 4 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d0f243ffabc1..3fedf4dbb761 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1470,7 +1470,7 @@ Reference< XShape > const & Shape::createAndInsert( if ( aEffectProperties.maGlow.moGlowRad.has() ) { uno::Reference<beans::XPropertySet> propertySet (mxShape, uno::UNO_QUERY); - propertySet->setPropertyValue("GlowEffectRad", makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get()))); + propertySet->setPropertyValue("GlowEffectRadius", makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get()))); propertySet->setPropertyValue("GlowEffectColor", makeAny(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper))); propertySet->setPropertyValue("GlowEffectTransparency", makeAny(aEffectProperties.maGlow.moGlowColor.getTransparency())); } @@ -1480,7 +1480,7 @@ Reference< XShape > const & Shape::createAndInsert( { uno::Reference<beans::XPropertySet> propertySet(mxShape, uno::UNO_QUERY); propertySet->setPropertyValue( - "SoftEdgeRad", makeAny(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.get()))); + "SoftEdgeRadius", makeAny(convertEmuToHmm(aEffectProperties.maSoftEdge.moRad.get()))); } } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 21825902f1a0..fc5807ee61ba 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3746,13 +3746,13 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet ) if( GetProperty( rXPropSet, "Shadow" ) ) mAny >>= bHasShadow; bool bHasEffects = bHasShadow; - if (!bHasEffects && GetProperty(rXPropSet, "GlowEffectRad")) + if (!bHasEffects && GetProperty(rXPropSet, "GlowEffectRadius")) { sal_Int32 rad = 0; mAny >>= rad; bHasEffects = rad > 0; } - if (!bHasEffects && GetProperty(rXPropSet, "SoftEdgeRad")) + if (!bHasEffects && GetProperty(rXPropSet, "SoftEdgeRadius")) { sal_Int32 rad = 0; mAny >>= rad; @@ -3862,7 +3862,7 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet ) void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet) { sal_Int32 nRad = 0; - rXPropSet->getPropertyValue("GlowEffectRad") >>= nRad; + rXPropSet->getPropertyValue("GlowEffectRadius") >>= nRad; if (!nRad) return; @@ -3884,7 +3884,7 @@ void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet) void DrawingML::WriteSoftEdgeEffect(const css::uno::Reference<css::beans::XPropertySet>& rXPropSet) { sal_Int32 nRad = 0; - rXPropSet->getPropertyValue("SoftEdgeRad") >>= nRad; + rXPropSet->getPropertyValue("SoftEdgeRadius") >>= nRad; if (!nRad) return; diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 667e479107e5..078284f18e39 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -208,7 +208,7 @@ GapwidthSequence GenerateVbaEvents Geometry3D GlowEffect -GlowEffectRad +GlowEffectRadius GradientName HatchName Graphic |