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

[Miklos Vajna (via logerrit)]

 oox/source/export/drawingml.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2045a84c9fa89fdd1a59807ddfae17d95fe4256c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Tue Feb 5 09:32:35 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed May 22 12:30:24 2019 +0200

    tdf#123106: oox: disable gradient fill grab-bag for PPTX
    
    This was added in commit 2fcf3a871c94feeca11619ef5c8c0466ce61eb74
    (ooxml: preserve gradient shape fill, 2014-01-31), and assumes that the
    theme colors can be preserved, as the theme definition is grab-bagged as
    well.
    
    But the theme is grab-bagged only for DOCX, not for PPTX, so skip
    gradient grab-bag for PPTX, otherwise the gradient would refer to
    incorrect colors in the theme.
    
    Change-Id: I98e1c67d4b10e68916f81dd7fc508eb4146d506b
    Reviewed-on: https://gerrit.libreoffice.org/67386
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/72681
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7d0aca3c3899..0f4f75c155cc 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -442,7 +442,9 @@ void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet )
         }
 
         // check if an ooxml gradient had been imported and if the user has modified it
-        if( EqualGradients( aOriginalGradient, aGradient ) )
+        // Gradient grab-bag depends on theme grab-bag, which is implemented
+        // only for DOCX.
+        if( EqualGradients( aOriginalGradient, aGradient ) && GetDocumentType() == DOCUMENT_DOCX)
         {
             // If we have no gradient stops that means original gradient were defined by a theme.
             if( aGradientStops.hasElements() )