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
+28 -35
View File
@@ -1289,51 +1289,44 @@ 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));
if (!span.isEmpty()) if (!span.isEmpty())
writer.writeAttribute(QStringLiteral("spans"), span); writer.writeAttribute(QStringLiteral("spans"), span);
if (rowsInfo.contains(row_num)) { if (rowsInfo.contains(row_num)) {
QSharedPointer<XlsxRowInfo> rowInfo = rowsInfo[row_num]; QSharedPointer<XlsxRowInfo> rowInfo = rowsInfo[row_num];
if (!rowInfo->format.isEmpty()) { if (!rowInfo->format.isEmpty()) {
writer.writeAttribute(QStringLiteral("s"), QString::number(rowInfo->format.xfIndex())); writer.writeAttribute(QStringLiteral("s"), QString::number(rowInfo->format.xfIndex()));
writer.writeAttribute(QStringLiteral("customFormat"), QStringLiteral("1")); writer.writeAttribute(QStringLiteral("customFormat"), QStringLiteral("1"));
} }
//!Todo: support customHeight from info struct //!Todo: support customHeight from info struct
//!Todo: where does this magic number '15' come from? //!Todo: where does this magic number '15' come from?
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)
writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
if (rowInfo->outlineLevel > 0)
writer.writeAttribute(QStringLiteral("outlineLevel"), QString::number(rowInfo->outlineLevel));
if (rowInfo->collapsed)
writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
} }
if (rowInfo->hidden)
writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
if (rowInfo->outlineLevel > 0)
writer.writeAttribute(QStringLiteral("outlineLevel"), QString::number(rowInfo->outlineLevel));
if (rowInfo->collapsed)
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
} }
} }