Skip to content

Fix worksheet dimensions when XML metadata is incomplete #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lite-tx wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix worksheet dimensions when XML metadata is incomplete #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93eda3d
Derive worksheet dimensions from loaded cells
lite-tx Jul 24, 2026
e8ba848
Extract worksheet cell position resolution
lite-tx Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions QXlsx/header/xlsxworksheet_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ class WorksheetPrivate : public AbstractSheetPrivate

public:
int checkDimensions(int row, int col, bool ignore_row = false, bool ignore_col = false);
void resolveCellPosition(CellReference &position,
bool hasExplicitReference,
int &row,
int &column);
Format cellFormat(int row, int col) const;
QString generateDimensionString() const;
void calculateSpans() const;
Expand Down
22 changes: 18 additions & 4 deletions QXlsx/source/xlsxworksheet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,10 +2342,7 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
QXmlStreamAttributes attributes = reader.attributes();
QString r = attributes.value(QLatin1String("r")).toString();
CellReference pos(r);
if (r.isEmpty()) {
pos.setRow(row_num);
pos.setColumn(++col_num);
}
resolveCellPosition(pos, !r.isEmpty(), row_num, col_num);

// get format
Format format;
Expand Down Expand Up @@ -2475,6 +2472,23 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
dimension.setLastColumn(col_num);
}

void WorksheetPrivate::resolveCellPosition(CellReference &position,
bool hasExplicitReference,
int &row,
int &column)
{
if (!hasExplicitReference) {
position.setRow(row);
position.setColumn(++column);
} else if (position.isValid()) {
row = position.row();
column = position.column();
}

if (position.isValid())
checkDimensions(position.row(), position.column());
}

void WorksheetPrivate::loadXmlColumnsInfo(QXmlStreamReader &reader)
{
Q_ASSERT(reader.name() == QLatin1String("cols"));
Expand Down