diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-06 16:13:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-06 17:30:27 +0200 |
| commit | c1c67cca7de5714635bef88de943b6c2e519eddf (patch) | |
| tree | 8911bc01834a39bdba3b645955bbc2fd48249b7b /oox | |
| parent | 8fa958d7d7f454cbea83fdafdde295ffd960787e (diff) | |
tdf#101181: support for transparency attribute of glow effect
Read/write support for ODF and OOXML (in ODF, loext:glow-transparency
attribute of style:graphic-properties has been added).
Added UI on glow sidebar panel.
Not used in actual painting yet.
Change-Id: I21b25d9c52c8611cd796f056374377ebf13cc2f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93565
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 1 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d962f008f34e..959f99ecffb4 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1472,6 +1472,7 @@ Reference< XShape > const & Shape::createAndInsert( propertySet->setPropertyValue("GlowEffect", makeAny(true)); propertySet->setPropertyValue("GlowEffectRad", makeAny(static_cast<sal_Int32>(aEffectProperties.maGlow.moGlowRad.get()))); propertySet->setPropertyValue("GlowEffectColor", makeAny(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper))); + propertySet->setPropertyValue("GlowEffectTransparency", makeAny(aEffectProperties.maGlow.moGlowColor.getTransparency())); } } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 81bbcd76be07..17b56e8e4f91 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3849,11 +3849,13 @@ void DrawingML::WriteGlowEffect(const Reference< XPropertySet >& rXPropSet) Sequence< PropertyValue > aGlowAttribs(1); aGlowAttribs[0].Name = "rad"; aGlowAttribs[0].Value = rXPropSet->getPropertyValue("GlowEffectRad"); - Sequence< PropertyValue > aGlowProps(2); + Sequence< PropertyValue > aGlowProps(3); aGlowProps[0].Name = "Attribs"; aGlowProps[0].Value <<= aGlowAttribs; aGlowProps[1].Name = "RgbClr"; aGlowProps[1].Value = rXPropSet->getPropertyValue("GlowEffectColor"); + aGlowProps[2].Name = "RgbClrTransparency"; + aGlowProps[2].Value = rXPropSet->getPropertyValue("GlowEffectTransparency"); // TODO other stuff like saturation or luminance WriteShapeEffect("glow", aGlowProps); |