QT/QXlsx
1
0
Fork 0
mirror of https://github.com/QtExcel/QXlsx.git synced 2025-01-30 05:02:52 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #311 from alexagr/fix-empty-columns

Browse Source 
- fix parsing of worksheets that lack column number / have invalid dimension
This commit is contained in:
Jay Two 2023-12-18 13:19:39 +09:00 committed by GitHub
commit 0c8a17626f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
QXlsx/source/xlsxworksheet.cpp
View File

@ -2261,6 +2261,9 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
Q_ASSERT(reader.name() == QLatin1String("sheetData")); Q_ASSERT(reader.name() == QLatin1String("sheetData"));
int row_num = 0;
int col_num = 0;
while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetData") && while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetData") &&
reader.tokenType() == QXmlStreamReader::EndElement)) { reader.tokenType() == QXmlStreamReader::EndElement)) {
if (reader.readNextStartElement()) { if (reader.readNextStartElement()) {
@ -2305,6 +2308,12 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
} }
} }
if (attributes.hasAttribute(QLatin1String("r")))
row_num = attributes.value(QLatin1String("r")).toInt();
else
++row_num;
col_num = 0;
} else if (reader.name() == QLatin1String("c")) // Cell } else if (reader.name() == QLatin1String("c")) // Cell
{ {
@ -2312,6 +2321,11 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
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);
if (r.isEmpty())
{
pos.setRow(row_num);
pos.setColumn(++col_num);
}
// get format // get format
Format format; Format format;
@ -2433,6 +2447,12 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
} }
} }
} }
if (dimension.lastRow() < row_num)
dimension.setLastRow(row_num);
if (dimension.lastColumn() < col_num)
dimension.setLastColumn(col_num);
} }
void WorksheetPrivate::loadXmlColumnsInfo(QXmlStreamReader &reader) void WorksheetPrivate::loadXmlColumnsInfo(QXmlStreamReader &reader)