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

Refactoring: Don't output the default "none" for dxfs fill

Browse Source
This commit is contained in:
Debao Zhang
2013-12-24 14:21:10 +08:00
parent f97bf1a1cd
commit cdb4646a0c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxstyles.cpp
+7 -2
View File
@@ -442,7 +442,7 @@ void Styles::writeFills(QXmlStreamWriter &writer)
writer.writeEndElement(); //fills writer.writeEndElement(); //fills
} }
void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool /*isDxf*/) void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool isDxf)
{ {
static QMap<int, QString> patternStrings; static QMap<int, QString> patternStrings;
if (patternStrings.isEmpty()) { if (patternStrings.isEmpty()) {
@@ -469,7 +469,12 @@ void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool /*isDx
writer.writeStartElement(QStringLiteral("fill")); writer.writeStartElement(QStringLiteral("fill"));
writer.writeStartElement(QStringLiteral("patternFill")); writer.writeStartElement(QStringLiteral("patternFill"));
writer.writeAttribute(QStringLiteral("patternType"), patternStrings[fill.fillPattern()]); Format::FillPattern pattern = fill.fillPattern();
// For normal fill formats, Excel prefer to outputing the default "none" attribute
// But for dxf, Excel prefer to omiting the default "none"
// Though not make any difference, but it make easier to compare origin files with generate files during debug
if (!(pattern == Format::PatternNone && isDxf))
writer.writeAttribute(QStringLiteral("patternType"), patternStrings[pattern]);
// 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.fillPattern() == Format::PatternSolid) { if (fill.fillPattern() == Format::PatternSolid) {
if (fill.hasProperty(FormatPrivate::P_Fill_BgColor)) if (fill.hasProperty(FormatPrivate::P_Fill_BgColor))