Fix issue #27: Remove the broken XlsxSheetItemInfo
Which is wrongly used to get the sheetId for definedName
This commit is contained in:
@@ -539,7 +539,7 @@ bool Workbook::loadFromXmlFile(QIODevice *device)
|
|||||||
data.comment = attrs.value(QLatin1String("comment")).toString();
|
data.comment = attrs.value(QLatin1String("comment")).toString();
|
||||||
if (attrs.hasAttribute(QLatin1String("localSheetId"))) {
|
if (attrs.hasAttribute(QLatin1String("localSheetId"))) {
|
||||||
int localId = attrs.value(QLatin1String("localSheetId")).toString().toInt();
|
int localId = attrs.value(QLatin1String("localSheetId")).toString().toInt();
|
||||||
int sheetId = d->sheetItemInfoList[localId].sheetId;
|
int sheetId = d->sheets.at(localId)->sheetId();
|
||||||
data.sheetId = sheetId;
|
data.sheetId = sheetId;
|
||||||
}
|
}
|
||||||
data.formula = reader.readElementText();
|
data.formula = reader.readElementText();
|
||||||
|
|||||||
@@ -47,16 +47,6 @@
|
|||||||
|
|
||||||
namespace QXlsx {
|
namespace QXlsx {
|
||||||
|
|
||||||
struct XlsxSheetItemInfo
|
|
||||||
{
|
|
||||||
XlsxSheetItemInfo(){}
|
|
||||||
|
|
||||||
QString name;
|
|
||||||
int sheetId;
|
|
||||||
QString rId;
|
|
||||||
QString state;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct XlsxDefineNameData
|
struct XlsxDefineNameData
|
||||||
{
|
{
|
||||||
XlsxDefineNameData()
|
XlsxDefineNameData()
|
||||||
@@ -91,8 +81,6 @@ public:
|
|||||||
QList<QSharedPointer<Chart> > chartFiles;
|
QList<QSharedPointer<Chart> > chartFiles;
|
||||||
QList<XlsxDefineNameData> definedNamesList;
|
QList<XlsxDefineNameData> definedNamesList;
|
||||||
|
|
||||||
QList<XlsxSheetItemInfo> sheetItemInfoList;//Data from xml file
|
|
||||||
|
|
||||||
bool strings_to_numbers_enabled;
|
bool strings_to_numbers_enabled;
|
||||||
bool html_to_richstring_enabled;
|
bool html_to_richstring_enabled;
|
||||||
bool date1904;
|
bool date1904;
|
||||||
|
|||||||
Reference in New Issue
Block a user