Browse Source

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

master
eho 11 years ago
parent
commit
bbf3ffd79d
  1. 13
      src/xlsx/xlsxworksheet.cpp

13
src/xlsx/xlsxworksheet.cpp

@ -1289,7 +1289,6 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
if (row_spans.contains(span_index))
span = row_spans[span_index];
if (cellTable.contains(row_num)) {
writer.writeStartElement(QStringLiteral("row"));
writer.writeAttribute(QStringLiteral("r"), QString::number(row_num));
@ -1307,14 +1306,10 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
if (rowInfo->customHeight) {
writer.writeAttribute(QStringLiteral("ht"), QString::number(rowInfo->height));
writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
qDebug() << "custom height: " << rowInfo->height;
} else {
writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("0"));
qDebug() << "no height: ";
}
if (rowInfo->hidden)
writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
if (rowInfo->outlineLevel > 0)
@ -1323,17 +1318,15 @@ void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
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++) {
if (cellTable[row_num].contains(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
}
}

Loading…
Cancel
Save