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

Fixed a bug where row formatting was not saved when row contained no filled cells.

Browse Source
This commit is contained in:
eho
2014-03-14 10:24:30 +01:00
parent b19758e14f
commit bbf3ffd79d
1 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+3 -10
View File
@@ -1289,7 +1289,6 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
if (row_spans.contains(span_index)) if (row_spans.contains(span_index))
span = row_spans[span_index]; span = row_spans[span_index];
if (cellTable.contains(row_num)) {
writer.writeStartElement(QStringLiteral("row")); writer.writeStartElement(QStringLiteral("row"));
writer.writeAttribute(QStringLiteral("r"), QString::number(row_num)); writer.writeAttribute(QStringLiteral("r"), QString::number(row_num));
@@ -1307,14 +1306,10 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
if (rowInfo->customHeight) { if (rowInfo->customHeight) {
writer.writeAttribute(QStringLiteral("ht"), QString::number(rowInfo->height)); writer.writeAttribute(QStringLiteral("ht"), QString::number(rowInfo->height));
writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
qDebug() << "custom height: " << rowInfo->height;
} else { } else {
writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("0")); writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("0"));
qDebug() << "no height: ";
} }
if (rowInfo->hidden) if (rowInfo->hidden)
writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
if (rowInfo->outlineLevel > 0) if (rowInfo->outlineLevel > 0)
@@ -1323,17 +1318,15 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
} }
//Write cell data if row contains filled cells
if (cellTable.contains(row_num)) {
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (cellTable[row_num].contains(col_num)) { if (cellTable[row_num].contains(col_num)) {
saveXmlCellData(writer, row_num, col_num, cellTable[row_num][col_num]); saveXmlCellData(writer, row_num, col_num, cellTable[row_num][col_num]);
} }
} }
writer.writeEndElement(); //row
} else if (comments.contains(row_num)){
} else {
} }
writer.writeEndElement(); //row
} }
} }