summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2018-08-08 17:57:51 +0200
committerAndras Timar <andras.timar@collabora.com>2018-08-10 10:21:06 +0200
commitdfc5d584e6635e9d28c15b6572588b17e07b972f (patch)
tree3e048bc81de5faa8d2cc8027cbc0f3d034de467c /oox
parent2b05c8c3a89357eee6fe5a4868292eb4621a9634 (diff)
tdf#116350 Fix export of fontwork
Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414 Reviewed-on: https://gerrit.libreoffice.org/58746 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 4989f86e6fad..73a33ed385fd 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -740,6 +740,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
bool bFlipH = false;
bool bFlipV = false;
+ // Avoid interference of preset type to the next shape
+ m_presetWarp = "";
+
if( GETA( CustomShapeGeometry ) ) {
SAL_INFO("oox.shape", "got custom shape geometry");
if( mAny >>= aGeometrySeq ) {
@@ -1003,7 +1006,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
}
if( rXPropSet.is() )
{
- WriteFill( rXPropSet );
+ // Preset shape with text has no fill
+ if( sShapeType.isEmpty() || !sShapeType.startsWith( "fontwork" ) )
+ WriteFill( rXPropSet );
WriteOutline( rXPropSet );
WriteShapeEffects( rXPropSet );
WriteShape3DEffects( rXPropSet );