Balazs Varga
1882c2017f
Follow-up to 92d78c3fa385f794b63cf6b328b41222f9e4c8b2 (Table Styles: Move Calc table style generation from OOXML filter to core). ComplexColor::applyTransformations() applies LumMod and LumOff as two separate RGB-HSL-RGB round-trips, which can produce off-by-one color values due to intermediate uint8 rounding. The OOXML filter's Color::getColor() avoided this by staying in HSL between the two transforms. Add ColorSet::resolveOOXMLColor() which collects LumMod and LumOff from the ComplexColor transforms and applies them in a single ApplyLumModOff() call. Also fixes the ComplexColor transform scale in TableStyleGenerator from 100'000 (OOXML scale) to 10'000 (ComplexColor convention), matching what the oox filter's createComplexColor() produces. Change-Id: Id0173f44ffa3663893e3012d7aefbeabbe264241 Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/232 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit b44399314130a10698a18ffdab482a68bfdcff1a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204568 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
105 lines
3.3 KiB
C++
105 lines
3.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
*/
|
|
|
|
#include <docmodel/theme/ColorSet.hxx>
|
|
#include <sstream>
|
|
#include <libxml/xmlwriter.h>
|
|
#include <sal/log.hxx>
|
|
|
|
namespace model
|
|
{
|
|
ColorSet::ColorSet(OUString const& rName)
|
|
: maName(rName)
|
|
{
|
|
}
|
|
|
|
void ColorSet::add(model::ThemeColorType eType, Color aColorData)
|
|
{
|
|
if (eType == model::ThemeColorType::Unknown)
|
|
return;
|
|
maColors[sal_Int16(eType)] = aColorData;
|
|
}
|
|
|
|
Color ColorSet::getColor(model::ThemeColorType eType) const
|
|
{
|
|
if (eType == model::ThemeColorType::Unknown)
|
|
{
|
|
SAL_WARN("svx", "ColorSet::getColor with ThemeColorType::Unknown");
|
|
return COL_AUTO;
|
|
}
|
|
return maColors[size_t(eType)];
|
|
}
|
|
|
|
Color ColorSet::resolveColor(model::ComplexColor const& rComplexColor) const
|
|
{
|
|
auto eThemeType = rComplexColor.getThemeColorType();
|
|
if (eThemeType == model::ThemeColorType::Unknown)
|
|
{
|
|
SAL_WARN("svx", "ColorSet::resolveColor with ThemeColorType::Unknown");
|
|
return COL_AUTO;
|
|
}
|
|
Color aColor = getColor(eThemeType);
|
|
return rComplexColor.applyTransformations(aColor);
|
|
}
|
|
|
|
Color ColorSet::resolveOOXMLColor(model::ComplexColor const& rComplexColor) const
|
|
{
|
|
auto eThemeType = rComplexColor.getThemeColorType();
|
|
if (eThemeType == model::ThemeColorType::Unknown)
|
|
{
|
|
SAL_WARN("svx", "ColorSet::resolveOOXMLColor with ThemeColorType::Unknown");
|
|
return COL_AUTO;
|
|
}
|
|
|
|
Color aColor = getColor(eThemeType);
|
|
|
|
// ComplexColor::applyTransformations() applies LumMod and LumOff as two
|
|
// separate RGB-HSL-RGB round-trips, but they must be combined into one
|
|
// call to get correct results (the intermediate round-trip can zero out
|
|
// saturation at boundary luminance values).
|
|
sal_Int16 nLumMod = 10'000;
|
|
sal_Int16 nLumOff = 0;
|
|
for (auto const& rTransform : rComplexColor.getTransformations())
|
|
{
|
|
if (rTransform.meType == model::TransformationType::LumMod)
|
|
nLumMod = static_cast<sal_Int16>(rTransform.mnValue);
|
|
else if (rTransform.meType == model::TransformationType::LumOff)
|
|
nLumOff = static_cast<sal_Int16>(rTransform.mnValue);
|
|
}
|
|
|
|
if (nLumMod != 10'000 || nLumOff != 0)
|
|
aColor.ApplyLumModOff(nLumMod, nLumOff);
|
|
|
|
return aColor;
|
|
}
|
|
|
|
void ColorSet::dumpAsXml(xmlTextWriterPtr pWriter) const
|
|
{
|
|
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("ColorSet"));
|
|
(void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this);
|
|
(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("maName"),
|
|
BAD_CAST(maName.toUtf8().getStr()));
|
|
|
|
for (const auto& rColor : maColors)
|
|
{
|
|
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("Color"));
|
|
std::stringstream ss;
|
|
ss << rColor;
|
|
(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(ss.str().c_str()));
|
|
(void)xmlTextWriterEndElement(pWriter);
|
|
}
|
|
|
|
(void)xmlTextWriterEndElement(pWriter);
|
|
}
|
|
|
|
} // end of namespace svx
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|