|
@ -2309,9 +2309,41 @@ bool Worksheet::loadFromXmlFile(QIODevice *device) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
validateDimension(); |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void Worksheet::validateDimension() |
|
|
|
|
|
{ |
|
|
|
|
|
Q_D(Worksheet); |
|
|
|
|
|
|
|
|
|
|
|
if (d->dimension.isValid() || d->cellTable.isEmpty()) |
|
|
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
int firstRow = d->cellTable.firstKey(); |
|
|
|
|
|
int lastRow = d->cellTable.lastKey(); |
|
|
|
|
|
int firstCell = -1; |
|
|
|
|
|
int lastCell = -1; |
|
|
|
|
|
|
|
|
|
|
|
for (QMap<int, QMap<int, QSharedPointer<Cell> > >::const_iterator it = d->cellTable.begin(), |
|
|
|
|
|
lim = d->cellTable.end(); it != lim; ++it) |
|
|
|
|
|
{ |
|
|
|
|
|
if (it.value().isEmpty()) |
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if (firstCell == -1 || it.value().firstKey() < firstCell) |
|
|
|
|
|
firstCell = it.value().firstKey(); |
|
|
|
|
|
|
|
|
|
|
|
if (lastCell == -1 || it.value().lastKey() > lastCell) |
|
|
|
|
|
lastCell = it.value().lastKey(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
CellRange cr(firstRow, firstCell, lastRow, lastCell); |
|
|
|
|
|
|
|
|
|
|
|
if (cr.isValid()) |
|
|
|
|
|
d->dimension = cr; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/*!
|
|
|
/*!
|
|
|
* \internal |
|
|
* \internal |
|
|
* Unit test can use this member to get sharedString object. |
|
|
* Unit test can use this member to get sharedString object. |
|
|