Browse Source

Bugfix: return default row values not specified.

master
eho 11 years ago
committed by Debao Zhang
parent
commit
dba81002d1
  1. 8
      src/xlsx/xlsxworksheet.cpp

8
src/xlsx/xlsxworksheet.cpp

@ -1717,8 +1717,8 @@ Format Worksheet::rowFormat(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 Format(); //return default on invalid row? return Format(); //return default on invalid row
return d->rowsInfo[row]->format; return d->rowsInfo[row]->format;
} }
@ -1731,8 +1731,8 @@ bool Worksheet::isRowHidden(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 false; //return default on invalid row? return false; //return default on invalid row
return d->rowsInfo[row]->hidden; return d->rowsInfo[row]->hidden;
} }

Loading…
Cancel
Save