summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2018-01-28 08:34:00 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2018-01-28 14:34:47 +0100
commit69acbf1994a2fd8606b119e7716996fb103b75c8 (patch)
tree24b0de80008c6a2ce353844b4ed3aa209fb902d0 /oox
parentf679fb89b6d021f12ebeb543a1efe519bd44f96b (diff)
tdf#111786: PPTX export: Shape's line transparency is not exported
Change-Id: Iab11906e6ed79e1e39bba1b07b50a25887517f3a Reviewed-on: https://gerrit.libreoffice.org/48763 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5af5dce2d12f..1deec7c82f74 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -577,6 +577,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
sal_uInt32 nLineWidth = 0;
sal_uInt32 nColor = 0;
+ sal_Int32 nColorAlpha = MAX_PERCENT;
bool bColorSet = false;
const char* cap = nullptr;
drawing::LineDash aLineDash;
@@ -656,6 +657,10 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
nColor = mAny.get<sal_uInt32>() & 0xffffff;
bColorSet = true;
}
+ if ( GETA( LineTransparence ) )
+ {
+ nColorAlpha = MAX_PERCENT - (mAny.get<sal_Int16>() * PER_PERCENT);
+ }
break;
}
@@ -670,7 +675,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
if( nColor != nOriginalColor )
{
// the user has set a different color for the line
- WriteSolidFill( nColor );
+ WriteSolidFill( nColor, nColorAlpha );
}
else if( !sColorFillScheme.isEmpty() )
{
@@ -687,7 +692,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
}
else
{
- WriteSolidFill( nColor );
+ WriteSolidFill( nColor, nColorAlpha );
}
}