diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-02-05 09:32:35 +0100 |
---|---|---|
committer | Xisco FaulĂ <xiscofauli@libreoffice.org> | 2019-05-22 12:30:24 +0200 |
commit | 2045a84c9fa89fdd1a59807ddfae17d95fe4256c (patch) | |
tree | f7eebaea7c47921206e168167b04b473e7966c6a /oox | |
parent | 3be6a74df8729e94c8c07bda56b7d99e7d984cc7 (diff) |
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@collabora.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/72681
Reviewed-by: Xisco FaulĂ <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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() ) |