[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source

[Libreoffice Gerrit user]

 oox/source/export/shapes.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6dda0acb8bb6ca0fba607e1d566fca960b78cf8
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Aug 10 11:46:59 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 20 13:49:11 2018 +0200

    tdf#119160 remove fill from all fontwork shapes
    
    Change-Id: I66cd5ab39c3f3b8635eb4e9b5261e100a8037abf
    Reviewed-on: https://gerrit.libreoffice.org/58817
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/58843
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8c4b2daaaff0..1e134babf2c7 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1011,7 +1011,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
     if( rXPropSet.is() )
     {
         // Preset shape with text has no fill
-        if( sShapeType.isEmpty() || !sShapeType.startsWith( "fontwork" ) )
+        if( m_presetWarp.isEmpty() || !m_presetWarp.startsWith( "text" ) || m_presetWarp == "textNoShape" )
             WriteFill( rXPropSet );
         WriteOutline( rXPropSet );
         WriteShapeEffects( rXPropSet );