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>

oox/source/export/shapes.cxx

@@ -743,6 +743,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 ) {
@@ -1006,7 +1009,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 );

sd/qa/unit/export-tests-ooxml2.cxx

@@ -1884,6 +1884,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();
 }