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

Bugfix: return default row height if row has no custom height.

Browse Source
This commit is contained in:
eho
2014-03-18 16:52:23 +01:00
committed by Debao Zhang
parent 76e0bd4e54
commit 1eea854740
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+6 -5
View File
@@ -1702,8 +1702,9 @@ double Worksheet::rowHeight(int row)
Q_D(Worksheet); Q_D(Worksheet);
int min_col = d->dimension.firstColumn() < 0 ? 0 : d->dimension.firstColumn(); int min_col = d->dimension.firstColumn() < 0 ? 0 : d->dimension.firstColumn();
if (d->checkDimensions(row, min_col, false, true)) if (d->checkDimensions(row, min_col, false, true) || !d->rowsInfo.contains(row))
return d->sheetFormatProps.defaultRowHeight; //return default on invalid row? return d->sheetFormatProps.defaultRowHeight; //return default on invalid row
return d->rowsInfo[row]->height; return d->rowsInfo[row]->height;
} }
@@ -1966,21 +1967,21 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
} }
} }
} else if (reader.name() == QLatin1String("c")) { } else if (reader.name() == QLatin1String("c")) { //Cell
QXmlStreamAttributes attributes = reader.attributes(); QXmlStreamAttributes attributes = reader.attributes();
QString r = attributes.value(QLatin1String("r")).toString(); QString r = attributes.value(QLatin1String("r")).toString();
CellReference pos(r); CellReference pos(r);
//get format //get format
Format format; Format format;
if (attributes.hasAttribute(QLatin1String("s"))) { if (attributes.hasAttribute(QLatin1String("s"))) { //"s" == style index
int idx = attributes.value(QLatin1String("s")).toString().toInt(); int idx = attributes.value(QLatin1String("s")).toString().toInt();
format = workbook->styles()->xfFormat(idx); format = workbook->styles()->xfFormat(idx);
if (!format.isValid()) if (!format.isValid())
qDebug()<<QStringLiteral("<c s=\"%1\">Invalid style index: ").arg(idx)<<idx; qDebug()<<QStringLiteral("<c s=\"%1\">Invalid style index: ").arg(idx)<<idx;
} }
if (attributes.hasAttribute(QLatin1String("t"))) { if (attributes.hasAttribute(QLatin1String("t"))) { // "t" == cell data type
QString type = attributes.value(QLatin1String("t")).toString(); QString type = attributes.value(QLatin1String("t")).toString();
if (type == QLatin1String("s")) { if (type == QLatin1String("s")) {
//string type //string type