core.git: Branch 'distro/collabora/co-24.04' - writerfilter/source

[Tomaž Vajngerl (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c28388326083bf509af4db9ace980b3e4a0dea5c
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Jan 27 23:13:48 2025 +0900
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jan 28 21:35:46 2025 +0100

    Set an empty ComplexColor, or the previous one could be used
    
    In some OOXML documents it can happen the ComplexColor is set to
    elements that shouldn't be set, so set one in all cases so we can
    be sure it is set to the ComplexColor we want.
    
    Change-Id: I480c788267c6497f8d6588790150aaa9f2a07c72
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180820
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 44d9132c0bca..479373de6660 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2415,11 +2415,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
             {
                 m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, 
uno::Any(pThemeColorHandler->mnColor));
 
+                model::ComplexColor aComplexColor;
+
                 auto eType = 
TDefTableHandler::getThemeColorTypeIndex(pThemeColorHandler->mnIndex);
                 if (eType != model::ThemeColorType::Unknown)
                 {
-
-                    model::ComplexColor aComplexColor;
                     aComplexColor.setThemeColor(eType);
 
                     auto eUsage = 
TDefTableHandler::getThemeColorUsage(pThemeColorHandler->mnIndex);
@@ -2435,11 +2435,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
                         sal_Int16 nShade = sal_Int16((255 - 
pThemeColorHandler->mnShade) * 10000 / 255);
                         
aComplexColor.addTransformation({model::TransformationType::Shade, nShade});
                     }
-
-                    auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
-                    m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
                 }
 
+                auto xComplexColor = 
model::color::createXComplexColor(aComplexColor);
+                m_pImpl->GetTopContext()->Insert(PROP_CHAR_COMPLEX_COLOR, 
uno::Any(xComplexColor));
+
                 uno::Any 
aColorAny(msfilter::util::ConvertColorOU(Color(ColorTransparency, 
pThemeColorHandler->mnColor)));
                 
m_pImpl->GetTopContext()->Insert(PROP_CHAR_THEME_ORIGINAL_COLOR, aColorAny, 
true, CHAR_GRAB_BAG);