strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oox: convert Excel tint value into LumOff and LumMod

Browse source 
tint value can be converted into LumOff and LumMod values, so we
don't need a special Excel case for calculating the final color.

Change-Id: I0725c06f9df6a37a309ea5d17b183e4100a228f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153716
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl 2023-06-28 22:55:22 +09:00 committed by Tomaž Vajngerl
parent e24a3a3c33
commit ba29922dcc
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
oox/source/drawingml/color.cxx
View file

@ -434,10 +434,18 @@ void Color::addChartTintTransformation( double fTint )
maTransforms.emplace_back( XML_tint, MAX_PERCENT - nValue ); maTransforms.emplace_back( XML_tint, MAX_PERCENT - nValue );
} }
void Color::addExcelTintTransformation( double fTint ) void Color::addExcelTintTransformation(double fTint)
{ {
sal_Int32 nValue = getLimitedValue< sal_Int32, double >( fTint * MAX_PERCENT + 0.5, -MAX_PERCENT, MAX_PERCENT ); sal_Int32 nValue = std::round(std::abs(fTint) * 100'000.0);
maTransforms.emplace_back( XLS_TOKEN( tint ), nValue ); if (fTint > 0.0)
{
maTransforms.emplace_back(XML_lumMod, 100'000 - nValue);
maTransforms.emplace_back(XML_lumOff, nValue);
}
else if (fTint < 0.0)
{
maTransforms.emplace_back(XML_lumMod, 100'000 - nValue);
}
} }
void Color::clearTransformations() void Color::clearTransformations()
@ -723,23 +731,6 @@ model::ComplexColor Color::getComplexColor() const
mnC3 = static_cast< sal_Int32 >( MAX_PERCENT - (MAX_PERCENT - mnC3) * fFactor ); mnC3 = static_cast< sal_Int32 >( MAX_PERCENT - (MAX_PERCENT - mnC3) * fFactor );
} }
break; break;
case XLS_TOKEN( tint ):
// Excel tint: move luminance relative to current value
toHsl();
OSL_ENSURE( (-MAX_PERCENT <= transform.mnValue) && (transform.mnValue <= MAX_PERCENT), "Color::getColor - invalid tint value" );
if( (-MAX_PERCENT <= transform.mnValue) && (transform.mnValue < 0) )
{
// negative: luminance towards 0% (black)
lclModValue( mnC3, transform.mnValue + MAX_PERCENT );
}
else if( (0 < transform.mnValue) && (transform.mnValue <= MAX_PERCENT) )
{
// positive: luminance towards 100% (white)
mnC3 = MAX_PERCENT - mnC3;
lclModValue( mnC3, MAX_PERCENT - transform.mnValue );
mnC3 = MAX_PERCENT - mnC3;
}
break;
case XML_gray: case XML_gray:
// change color to gray, weighted RGB: 22% red, 72% green, 6% blue // change color to gray, weighted RGB: 22% red, 72% green, 6% blue
@ -844,7 +835,7 @@ model::ComplexColor Color::createComplexColor(const GraphicHelper& /*rGraphicHel
{ {
sal_Int16 nValue = sal_Int16(aTransform.mnValue / 10); sal_Int16 nValue = sal_Int16(aTransform.mnValue / 10);
switch(aTransform.mnToken) switch (aTransform.mnToken)
{ {
case XML_lumMod: case XML_lumMod:
if (nValue != 10'000) if (nValue != 10'000)