oox/source/export/shapes.cxx | 7 ++++++- sd/qa/unit/export-tests-ooxml2.cxx | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 406280c62843e9ed167e7adaa005fba92a39608f Author: Szymon Kłos <szymon.k...@collabora.com> AuthorDate: Wed Aug 8 17:57:51 2018 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Mon Aug 20 10:14:17 2018 +0200 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.k...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/58841 Reviewed-by: Andras Timar <andras.ti...@collabora.com> 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 ); diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index c72ebc2f3158..1f246fec7a90 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -1743,6 +1743,7 @@ void SdOOXMLExportTest2::testTdf116350TextEffects() xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); assertXPath(pXmlDocContent, "//p:sp[1]/p:txBody/a:bodyPr/a:prstTxWarp", "prst", "textArchUp"); assertXPath(pXmlDocContent, "//p:sp[14]/p:txBody/a:bodyPr/a:prstTxWarp", "prst", "textCircle"); + assertXPath(pXmlDocContent, "//p:sp[14]/p:spPr/a:solidFill/a:srgbClr", 0); xDocShRef->DoClose(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits