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

Refuse all the operations on row 0 or column 0

Browse Source 
As row and column all start from 1 instead of 0
This commit is contained in:
Debao Zhang
2014-03-06 17:28:59 +08:00
parent 88b43033c3
commit bd921dddf9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+4 -4
View File
@@ -147,7 +147,7 @@ QString WorksheetPrivate::generateDimensionString() const
*/ */
int WorksheetPrivate::checkDimensions(int row, int col, bool ignore_row, bool ignore_col) int WorksheetPrivate::checkDimensions(int row, int col, bool ignore_row, bool ignore_col)
{ {
if (row >= XLSX_ROW_MAX || col >= XLSX_COLUMN_MAX) if (row > XLSX_ROW_MAX || row < 1 || col > XLSX_COLUMN_MAX || col < 1)
return -1; return -1;
if (!ignore_row) { if (!ignore_row) {
@@ -1493,7 +1493,7 @@ void WorksheetPrivate::saveXmlDrawings(QXmlStreamWriter &writer) const
bool Worksheet::setRow(int row, double height, const Format &format, bool hidden) bool Worksheet::setRow(int row, double height, const Format &format, bool hidden)
{ {
Q_D(Worksheet); Q_D(Worksheet);
int min_col = d->dimension.firstColumn() < 0 ? 0 : d->dimension.firstColumn(); int min_col = d->dimension.firstColumn() < 1 ? 1 : d->dimension.firstColumn();
if (d->checkDimensions(row, min_col, false, true)) if (d->checkDimensions(row, min_col, false, true))
return false; return false;
@@ -1563,9 +1563,9 @@ bool Worksheet::setColumn(int colFirst, int colLast, double width, const Format
if (colFirst > colLast) if (colFirst > colLast)
return false; return false;
if (d->checkDimensions(0, colLast, ignore_row, ignore_col)) if (d->checkDimensions(1, colLast, ignore_row, ignore_col))
return false; return false;
if (d->checkDimensions(0, colFirst, ignore_row, ignore_col)) if (d->checkDimensions(1, colFirst, ignore_row, ignore_col))
return false; return false;
d->splitColsInfo(colFirst, colLast); d->splitColsInfo(colFirst, colLast);