From 02e032152d430d4995854ccc816844902b5f697b Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Wed, 26 Feb 2014 09:56:31 +0800 Subject: [PATCH] Fix issue #27: Remove the broken XlsxSheetItemInfo Which is wrongly used to get the sheetId for definedName --- src/xlsx/xlsxworkbook.cpp | 2 +- src/xlsx/xlsxworkbook_p.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/xlsx/xlsxworkbook.cpp b/src/xlsx/xlsxworkbook.cpp index aaa7f35..b2fa71b 100755 --- a/src/xlsx/xlsxworkbook.cpp +++ b/src/xlsx/xlsxworkbook.cpp @@ -539,7 +539,7 @@ bool Workbook::loadFromXmlFile(QIODevice *device) data.comment = attrs.value(QLatin1String("comment")).toString(); if (attrs.hasAttribute(QLatin1String("localSheetId"))) { 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.formula = reader.readElementText(); diff --git a/src/xlsx/xlsxworkbook_p.h b/src/xlsx/xlsxworkbook_p.h index f6abc0f..0ef0aad 100644 --- a/src/xlsx/xlsxworkbook_p.h +++ b/src/xlsx/xlsxworkbook_p.h @@ -47,16 +47,6 @@ namespace QXlsx { -struct XlsxSheetItemInfo -{ - XlsxSheetItemInfo(){} - - QString name; - int sheetId; - QString rId; - QString state; -}; - struct XlsxDefineNameData { XlsxDefineNameData() @@ -91,8 +81,6 @@ public: QList > chartFiles; QList definedNamesList; - QList sheetItemInfoList;//Data from xml file - bool strings_to_numbers_enabled; bool html_to_richstring_enabled; bool date1904;