sw/source/writerfilter/dmapper/DomainMapper.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 76324a5c75b04c0288d8636b3e270f0273ce4e65 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Jan 27 23:13:48 2025 +0900 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Jan 28 14:11:56 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/+/180786 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Jenkins diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx b/sw/source/writerfilter/dmapper/DomainMapper.cxx index 86e785a0dd4c..1f48a0eb2b00 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx @@ -2426,11 +2426,11 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) if (aAnyComplexColor.has_value()) return; + 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); @@ -2446,11 +2446,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);
