fdo#76979 DOCX export: a:srgbClr should be always an explicit color
The brush color contains both the color itself and transparency as well. In case of DocxAttributeOutput::FormatBackground(), the sColor should contain the color part, and oAlpha the transparency part. In case of drawingML export of Writer TextFrames, an automatic color (0xFFFFFFF) shouldn't be recognized as "auto", as that's invalid: instead an explicit 0xFFFFFF with zero transparency should be written. Fix the problem by calling msfilter::util::ConvertColor() for the RGB color only. Change-Id: I2132375a4dbcac1667aed49c74e581183178b0cc
This commit is contained in:
BIN
sw/qa/extras/ooxmlexport/data/fdo76979.docx
Normal file
BIN
sw/qa/extras/ooxmlexport/data/fdo76979.docx
Normal file
Binary file not shown.
@@ -1000,6 +1000,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, "fdo76249.docx")
|
||||
assertXPath(pXmlDoc, "//mc:Choice/w:drawing//w:txbxContent//w:drawing//lc:lockedCanvas", 1);
|
||||
}
|
||||
|
||||
DECLARE_OOXMLEXPORT_TEST(testFdo76979, "fdo76979.docx")
|
||||
{
|
||||
// The problem was that black was exported as "auto" fill color, resulting in well-formed, but invalid XML.
|
||||
xmlDocPtr pXmlDoc = parseExport("word/header2.xml");
|
||||
if (!pXmlDoc)
|
||||
return;
|
||||
// This was "auto", not "FFFFFF".
|
||||
assertXPath(pXmlDoc, "//wps:spPr/a:solidFill/a:srgbClr", "val", "FFFFFF");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
CPPUNIT_PLUGIN_IMPLEMENT();
|
||||
|
@@ -6528,7 +6528,7 @@ boost::optional<sal_Int32> lcl_getDmlAlpha(const SvxBrushItem& rBrush)
|
||||
|
||||
void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
|
||||
{
|
||||
OString sColor = msfilter::util::ConvertColor( rBrush.GetColor( ) );
|
||||
OString sColor = msfilter::util::ConvertColor( rBrush.GetColor().GetRGBColor() );
|
||||
boost::optional<sal_Int32> oAlpha = lcl_getDmlAlpha(rBrush);
|
||||
if (m_rExport.SdrExporter().getTextFrameSyntax())
|
||||
{
|
||||
|
Reference in New Issue
Block a user