[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - xmloff/source

[Luboš Luňák (via logerrit)]

 xmloff/source/draw/animationexport.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f6abac0b795838e04fdd436c906d996f41dab3ad
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Nov 24 15:04:24 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Nov 26 12:10:38 2020 +0100

    save properly fadecolor also for fadeovercolor (tdf#138353)
    
    As far as I can tell .odp spec doesn't recognize 'fadeovercolor'
    as a subtype of 'fade' (it's an LO extension?). But it's already
    saved by LO if used, so save the color properly as well. Reading
    it already works too.
    
    Change-Id: I30e464123f17d513fd0eaa32797f06e76a91d532
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106505
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 21d36af1fd3037f1f425dd8303b50b8848d729ce)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106528

diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 92238ebf71e0..0c750a3130a2 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -605,7 +605,9 @@ void AnimationsExporterImpl::exportTransitionNode()
         if( !bDirection )
             mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
 
-        if( (nTransition == TransitionType::FADE) && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR) ))
+        if( (nTransition == TransitionType::FADE)
+                && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR)
+                    || (nSubtype == TransitionSubType::FADEOVERCOLOR)))
         {
             ::sax::Converter::convertColor( sTmp, nFadeColor );
             mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );