From 406280c62843e9ed167e7adaa005fba92a39608f Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Wed, 8 Aug 2018 17:57:51 +0200 Subject: tdf#116350 Fix export of fontwork MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf3a07c6b79296feb233bbe08a6d69ab21a41414 Reviewed-on: https://gerrit.libreoffice.org/58746 Tested-by: Jenkins Reviewed-by: Szymon Kłos Reviewed-on: https://gerrit.libreoffice.org/58841 Reviewed-by: Andras Timar --- oox/source/export/shapes.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 95cc968f76ff..8c4b2daaaff0 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -744,6 +744,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 ) { @@ -1007,7 +1010,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 ); -- cgit v1.2.3