summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-07-01 21:10:01 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-07-03 14:45:35 +0200
commit1e8a9c19a6f7b82c9e0c481aee0c04c0780f4433 (patch)
tree22591c1372e74bb55212bf67221c1091eb9c8201 /oox
parentc0c4152c6077839d0e6c65dac64fde894d6aafbe (diff)
tdf#125554 PPTX export: handle gradient transparency for gradient fill
Regression from commit cfc1f4ea4889f768d689a0df71519e9bcb707bc0 (oox: disable gradient fill grab-bag for PPTX, 2019-02-05), the problem was that in the past grab-bag roundtrip worked (in some cases) for this shape fill case, but true roundtrip did not. So when the commit disabled grab-bags (since their color pointers in the theme don't work in the PPTX case), a previously not implemented feature now started causing a real problem. Fix the bug by adding support for transparent linear gradients on the exports side. This means that in case the import creates both a fill gradient and a transparency gradient, then now the export creates markup based on both, not only based on the fill gradient. Change-Id: I99fa3caba2b2884c2acb7e0704bbeb0b6cffd4a4 Reviewed-on: https://gerrit.libreoffice.org/74968 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 599ae1151bf893491db7ad983d64c77521c3ae9d) Reviewed-on: https://gerrit.libreoffice.org/75032
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx43
1 files changed, 37 insertions, 6 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 85834a14b1b0..38320242c3ce 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -130,6 +130,17 @@ using ::css::io::XOutputStream;
using ::sax_fastparser::FSHelperPtr;
using ::sax_fastparser::FastSerializerHelper;
+namespace
+{
+/// Extracts start or end alpha information from a transparency gradient.
+sal_Int32 GetAlphaFromTransparenceGradient(const awt::Gradient& rGradient, bool bStart)
+{
+ // Our alpha is a gray color value.
+ sal_uInt8 nRed = ::Color(bStart ? rGradient.StartColor : rGradient.EndColor).GetRed();
+ // drawingML alpha is a percentage on a 0..100000 scale.
+ return (255 - nRed) * oox::drawingml::MAX_PERCENT / 255;
+}
+}
namespace oox {
namespace drawingml {
@@ -413,10 +424,10 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet )
}
}
-void DrawingML::WriteGradientStop( sal_uInt16 nStop, ::Color nColor )
+void DrawingML::WriteGradientStop(sal_uInt16 nStop, ::Color nColor, sal_Int32 nAlpha)
{
mpFS->startElementNS(XML_a, XML_gs, XML_pos, OString::number(nStop * 1000));
- WriteColor( nColor );
+ WriteColor(nColor, nAlpha);
mpFS->endElementNS( XML_a, XML_gs );
}
@@ -478,7 +489,7 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet )
else
{
mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0");
- WriteGradientFill(aGradient);
+ WriteGradientFill(aGradient, rXPropSet);
mpFS->endElementNS( XML_a, XML_gradFill );
}
}
@@ -543,20 +554,40 @@ void DrawingML::WriteGrabBagGradientFill( const Sequence< PropertyValue >& aGrad
}
}
-void DrawingML::WriteGradientFill( awt::Gradient rGradient )
+void DrawingML::WriteGradientFill(awt::Gradient rGradient,
+ const uno::Reference<beans::XPropertySet>& rXPropSet)
{
switch( rGradient.Style )
{
default:
case awt::GradientStyle_LINEAR:
+ {
+ awt::Gradient aTransparenceGradient;
+ bool bTransparent = false;
+ if (rXPropSet.is() && GetProperty(rXPropSet, "FillTransparenceGradient"))
+ {
+ aTransparenceGradient = *o3tl::doAccess<awt::Gradient>(mAny);
+ bTransparent = true;
+ }
+
mpFS->startElementNS(XML_a, XML_gsLst);
- WriteGradientStop( 0, ColorWithIntensity( rGradient.StartColor, rGradient.StartIntensity ) );
- WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor, rGradient.EndIntensity ) );
+ sal_Int32 nStartAlpha = MAX_PERCENT;
+ sal_Int32 nEndAlpha = MAX_PERCENT;
+ if (bTransparent)
+ {
+ nStartAlpha = GetAlphaFromTransparenceGradient(aTransparenceGradient, true);
+ nEndAlpha = GetAlphaFromTransparenceGradient(aTransparenceGradient, false);
+ }
+ WriteGradientStop(0, ColorWithIntensity(rGradient.StartColor, rGradient.StartIntensity),
+ nStartAlpha);
+ WriteGradientStop(100, ColorWithIntensity(rGradient.EndColor, rGradient.EndIntensity),
+ nEndAlpha);
mpFS->endElementNS( XML_a, XML_gsLst );
mpFS->singleElementNS(
XML_a, XML_lin, XML_ang,
OString::number((((3600 - rGradient.Angle + 900) * 6000) % 21600000)));
break;
+ }
case awt::GradientStyle_AXIAL:
mpFS->startElementNS(XML_a, XML_gsLst);