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

Using QXlsx::CellRange instead of the private XlsxCellRange

Browse Source
This commit is contained in:
Debao Zhang
2013-10-29 17:24:44 +08:00
parent e283a0af7f
commit 0155cc5409
5 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xlsx/xlsxworksheet_p.h
+1 -18
View File
@@ -74,23 +74,6 @@ struct XlsxImageData
double yScale;
};
struct XlsxCellRange
{
int row_begin;
int row_end;
int column_begin;
int column_end;
bool operator ==(const XlsxCellRange &other) const {
return row_begin==other.row_begin && row_end==other.row_end
&& column_begin == other.column_begin && column_end==other.column_end;
}
bool operator !=(const XlsxCellRange &other) const {
return row_begin!=other.row_begin || row_end!=other.row_end
|| column_begin != other.column_begin || column_end!=other.column_end;
}
};
/*
The vertices that define the position of a graphical object
within the worksheet in pixels.
@@ -198,7 +181,7 @@ public:
QMap<int, QMap<int, QSharedPointer<Cell> > > cellTable;
QMap<int, QMap<int, QString> > comments;
QMap<int, QMap<int, XlsxUrlData *> > urlTable;
QList<XlsxCellRange> merges;
QList<CellRange> merges;
QStringList externUrlList;
QStringList externDrawingList;
QList<XlsxImageData *> imageList;