TianZD/QtXlsxWriter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code refacting: write fgColor before bgColor

Browse Source
This commit is contained in:
Debao Zhang
2013-12-24 09:48:45 +08:00
parent 9067bbfcb2
commit a8cde04d7a
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxstyles.cpp
+10 -15
View File
@@ -467,22 +467,17 @@ void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool /*isDx
writer.writeStartElement(QStringLiteral("patternFill")); writer.writeStartElement(QStringLiteral("patternFill"));
writer.writeAttribute(QStringLiteral("patternType"), patternStrings[fill.fillPattern()]); writer.writeAttribute(QStringLiteral("patternType"), patternStrings[fill.fillPattern()]);
// For a solid fill, Excel reverses the role of foreground and background colours // For a solid fill, Excel reverses the role of foreground and background colours
if (fill.hasProperty(FormatPrivate::P_Fill_FgColor)) { if (fill.fillPattern() == Format::PatternSolid) {
XlsxColor color = fill.property(FormatPrivate::P_Fill_FgColor).value<XlsxColor>(); if (fill.hasProperty(FormatPrivate::P_Fill_BgColor))
if (fill.fillPattern() == Format::PatternSolid) fill.property(FormatPrivate::P_Fill_BgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("fgColor"));
color.saveToXml(writer, QStringLiteral("bgColor")); if (fill.hasProperty(FormatPrivate::P_Fill_FgColor))
else fill.property(FormatPrivate::P_Fill_FgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("bgColor"));
color.saveToXml(writer, QStringLiteral("fgColor")); } else {
if (fill.hasProperty(FormatPrivate::P_Fill_FgColor))
fill.property(FormatPrivate::P_Fill_FgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("fgColor"));
if (fill.hasProperty(FormatPrivate::P_Fill_BgColor))
fill.property(FormatPrivate::P_Fill_BgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("bgColor"));
} }
if (fill.hasProperty(FormatPrivate::P_Fill_BgColor)) {
XlsxColor color = fill.property(FormatPrivate::P_Fill_BgColor).value<XlsxColor>();
if (fill.fillPattern() == Format::PatternSolid)
color.saveToXml(writer, QStringLiteral("fgColor"));
else
color.saveToXml(writer, QStringLiteral("bgColor"));
}
writer.writeEndElement();//patternFill writer.writeEndElement();//patternFill
writer.writeEndElement();//fill writer.writeEndElement();//fill
} }