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

Issue 17: Don't used int limit any more

Browse Source 
Using two normal integer is enough. As the value of col_num between
1 and XLSX_COLUMN_MAX.
This commit is contained in:
Debao Zhang
2014-01-03 17:04:59 +08:00
parent 5476d0be80
commit 11d78e8221
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet.cpp
+9 -10
View File
@@ -48,7 +48,6 @@
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <limits>
#include <math.h> #include <math.h>
QT_BEGIN_NAMESPACE_XLSX QT_BEGIN_NAMESPACE_XLSX
@@ -87,20 +86,20 @@ WorksheetPrivate::~WorksheetPrivate()
void WorksheetPrivate::calculateSpans() void WorksheetPrivate::calculateSpans()
{ {
row_spans.clear(); row_spans.clear();
int span_min = std::numeric_limits<int>::max(); int span_min = XLSX_COLUMN_MAX+1;
int span_max = std::numeric_limits<int>::min(); int span_max = -1;
for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) { for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
if (cellTable.contains(row_num)) { if (cellTable.contains(row_num)) {
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (cellTable[row_num].contains(col_num)) { if (cellTable[row_num].contains(col_num)) {
if (span_max == std::numeric_limits<int>::min()) { if (span_max == -1) {
span_min = col_num; span_min = col_num;
span_max = col_num; span_max = col_num;
} else { } else {
if (col_num < span_min) if (col_num < span_min)
span_min = col_num; span_min = col_num;
if (col_num > span_max) else if (col_num > span_max)
span_max = col_num; span_max = col_num;
} }
} }
@@ -109,13 +108,13 @@ void WorksheetPrivate::calculateSpans()
if (comments.contains(row_num)) { if (comments.contains(row_num)) {
for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) { for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
if (comments[row_num].contains(col_num)) { if (comments[row_num].contains(col_num)) {
if (span_max == std::numeric_limits<int>::min()) { if (span_max == -1) {
span_min = col_num; span_min = col_num;
span_max = col_num; span_max = col_num;
} else { } else {
if (col_num < span_min) if (col_num < span_min)
span_min = col_num; span_min = col_num;
if (col_num > span_max) else if (col_num > span_max)
span_max = col_num; span_max = col_num;
} }
} }
@@ -123,10 +122,10 @@ void WorksheetPrivate::calculateSpans()
} }
if (row_num%16 == 0 || row_num == dimension.lastRow()) { if (row_num%16 == 0 || row_num == dimension.lastRow()) {
if (span_max != std::numeric_limits<int>::min()) { if (span_max != -1) {
row_spans[row_num / 16] = QStringLiteral("%1:%2").arg(span_min).arg(span_max); row_spans[row_num / 16] = QStringLiteral("%1:%2").arg(span_min).arg(span_max);
span_min = std::numeric_limits<int>::max(); span_min = XLSX_COLUMN_MAX+1;
span_max = std::numeric_limits<int>::min(); span_max = -1;
} }
} }
} }