Kaydet (Commit) 4b0cb789 authored tarafından Adam Co's avatar Adam Co Kaydeden (comit) Miklos Vajna

fdo#65295 : swap gradient text-box colors only in case of axis

This commit changes the behavior of the export process of text-box
gradient color. Currently it exports the colors inverted,
but it should do so only when it is an 'axis' gradient.

Change-Id: I8841982c1dbc57616d6e1640d73bc8aa823ae056
Reviewed-on: https://gerrit.libreoffice.org/6646Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 6e0f2459
......@@ -5897,21 +5897,29 @@ void DocxAttributeOutput::FormatFillGradient( const XFillGradientItem& rFillGrad
const XGradient& rGradient = rFillGradient.GetGradientValue();
OString sStartColor = msfilter::util::ConvertColor(rGradient.GetStartColor());
m_pFlyFillAttrList->add(XML_color2, "#" + sStartColor);
OString sEndColor = msfilter::util::ConvertColor(rGradient.GetEndColor());
m_pFlyAttrList->add(XML_fillcolor, "#" + sEndColor);
OString sColor1 = sStartColor;
OString sColor2 = sEndColor;
switch (rGradient.GetGradientStyle())
{
case XGRAD_LINEAR: break;
case XGRAD_AXIAL:
m_pFlyFillAttrList->add(XML_focus, "50%");
// If it is an 'axial' gradient - swap the colors
// (because in the import process they were imported swapped)
sColor1 = sEndColor;
sColor2 = sStartColor;
break;
case XGRAD_LINEAR: break;
case XGRAD_RADIAL: break;
case XGRAD_ELLIPTICAL: break;
case XGRAD_SQUARE: break;
case XGRAD_RECT: break;
}
m_pFlyAttrList->add(XML_fillcolor , "#" + sColor1);
m_pFlyFillAttrList->add(XML_color2, "#" + sColor2);
}
m_oFillStyle.reset();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment