diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp index 4584852d6c..6dff92579a 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CrtMlFrt.cpp @@ -56,11 +56,6 @@ void CrtMlFrt::readFields(CFRecord& record) Log::error("CrtMlFrt record is not implemented."); record.skipNunBytes(record.getDataSize() - record.getRdPtr()); -// -// if (cb > 0) -// { -// //XmlTkChain -// } } } // namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBQueryExt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBQueryExt.cpp index a652750a38..433ba01470 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBQueryExt.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBQueryExt.cpp @@ -54,7 +54,6 @@ void DBQueryExt::readFields(CFRecord& record) { #pragma message("####################### DBQueryExt record is not implemented") Log::error("DBQueryExt record is not implemented."); - //record >> some_value; record.skipNunBytes(record.getDataSize() - record.getRdPtr()); } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.cpp index 557cae58dd..8002f77f65 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.cpp @@ -52,8 +52,7 @@ BaseObjectPtr DCon::clone() void DCon::readFields(CFRecord& record) { - #pragma message("####################### DCon record is not implemented") - //record >> iiftab >> fLeftCat >> fTopCat >> fLinkConsole; + record >> iiftab >> fLeftCat >> fTopCat >> fLinkConsole; } } // namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.h index 646e6e68ff..88f9acdcb6 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DCon.h @@ -36,8 +36,6 @@ namespace XLS { - -// Logical representation of DCon record in BIFF8 class DCon: public BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(DCon) diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.cpp index 4a687594c8..54b1a03a58 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.cpp @@ -53,9 +53,17 @@ BaseObjectPtr DConBin::clone() void DConBin::readFields(CFRecord& record) { -#pragma message("####################### DConBin record is not implemented") - Log::error("DConBin record is not implemented."); - //record >> some_value; + unsigned short reserved1; + unsigned char reserved2; + record >> nBuiltin >> reserved1 >> reserved2 >> cchFile; + + if (cchFile > 0 && cchFile < 0xffff) + { + stFile.setSize(cchFile); + record >> stFile; + } + + // skip unused record.skipNunBytes(record.getDataSize() - record.getRdPtr()); } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.h index 1f35346c12..c757939b00 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DConBin.h @@ -32,12 +32,11 @@ #pragma once #include "BiffRecord.h" +#include "../Biff_structures/BiffString.h" namespace XLS { - -// Logical representation of DConBin record in BIFF8 class DConBin: public BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(DConBin) @@ -48,11 +47,13 @@ public: BaseObjectPtr clone(); - void readFields(CFRecord& record); - static const ElementType type = typeDConBin; + static const ElementType type = typeDConBin; + unsigned char nBuiltin; + unsigned short cchFile; + XLUnicodeStringNoCch stFile; }; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DbOrParamQry.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DbOrParamQry.cpp index 2a4e60c52f..439be941df 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DbOrParamQry.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DbOrParamQry.cpp @@ -54,7 +54,6 @@ void DbOrParamQry::readFields(CFRecord& record) { #pragma message("####################### DbOrParamQry record is not implemented") Log::error("DbOrParamQry record is not implemented."); - //record >> some_value; record.skipNunBytes(record.getDataSize() - record.getRdPtr()); } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.cpp index e4aaefeb43..212bc6fabb 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.cpp @@ -53,7 +53,7 @@ BaseObjectPtr FnGrp12::clone() void FnGrp12::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> astFnGrp; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.cpp index 4b248522b0..3a090001a6 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.cpp @@ -53,7 +53,7 @@ BaseObjectPtr ForceFullCalculation::clone() void ForceFullCalculation::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") _UINT32 temp; record >> temp; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.cpp index e591d1339e..44e46289bc 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.cpp @@ -53,7 +53,7 @@ BaseObjectPtr GUIDTypeLib::clone() void GUIDTypeLib::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") _GUID_ guid_num; record >> guid_num; guid = STR::guid2bstr(guid_num); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.cpp index ecf6d45941..bed0138785 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.cpp @@ -53,7 +53,7 @@ BaseObjectPtr MDB::clone() void MDB::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") while(!record.isEOF()) { MDirPtr element(new MDir); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.cpp index a15e3a754a..ca249daad2 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.cpp @@ -53,7 +53,7 @@ BaseObjectPtr MDTInfo::clone() void MDTInfo::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") _UINT32 flags; record >> flags; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.cpp index 6fe4a45a7b..4984b01430 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.cpp @@ -53,7 +53,7 @@ BaseObjectPtr MDXKPI::clone() void MDXKPI::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> istrConnName >> tfnSrc >> kpiprop >> istrKPIName >> istrMbrKPI; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.cpp index ba1fc06c96..0be356bcc2 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.cpp @@ -54,7 +54,7 @@ BaseObjectPtr MDXProp::clone() void MDXProp::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> istrConnName >> tfnSrc >> istrMbr >> istrProp; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.cpp index 3e80bf0ec6..f0997025c5 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.cpp @@ -54,7 +54,7 @@ BaseObjectPtr MDXSet::clone() void MDXSet::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> istrConnName >> tfnSrc >> sso >> istrSetDef >> cistr; while(!record.isEOF()) { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.cpp index 22bf2ee1cf..e530ead7a3 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.cpp @@ -54,7 +54,7 @@ BaseObjectPtr MDXStr::clone() void MDXStr::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> st; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.cpp index 9b77f0177f..2ca30d413c 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.cpp @@ -54,7 +54,7 @@ BaseObjectPtr MDXTuple::clone() void MDXTuple::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> istrConnName >> tfnSrc >> cistr; while(!record.isEOF()) { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.cpp index 86dc0cacda..11cf0cf673 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.cpp @@ -53,7 +53,7 @@ BaseObjectPtr NameFnGrp12::clone() void NameFnGrp12::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> cachName >> fgrp >> rgach; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.cpp index 7ce4477281..d56b4852be 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.cpp @@ -53,7 +53,7 @@ BaseObjectPtr NamePublish::clone() void NamePublish::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") unsigned short flags; record >> flags >> strName; fPublished = GETBIT(flags, 0); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.cpp index bffa0e6ff8..8bd03bdd19 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.cpp @@ -52,9 +52,20 @@ BaseObjectPtr Qsir::clone() void Qsir::readFields(CFRecord& record) { -#pragma message("####################### Qsir record is not implemented") - Log::error("Qsir record is not implemented."); - //record >> some_value; + _UINT32 flags; + + record >> frtRefHeaderU >> cbQsirSaved >> cbQsifSaved >> flags >> iSortCustom >> cQsif >> cpstDeleted >> idFieldNext >> ccolExtraLeft >> ccolExtraRight; + record >> idList >> rgbTitle; + + fPersist = GETBIT(flags, 0); + fPersistSort = GETBIT(flags, 1); + fPersistAutoFilter = GETBIT(flags, 2); + fSorted = GETBIT(flags, 20); + fCaseSensSort = GETBIT(flags, 21); + fHdrRowSort = GETBIT(flags, 22); + fidWrapped = GETBIT(flags, 23); + fTitlesOld = GETBIT(flags, 25); + wVerBeforeRefreshAlert = GETBITS(flags, 26, 30); } } // namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.h index a765640df1..7aea680fe7 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Qsir.h @@ -32,12 +32,12 @@ #pragma once #include "BiffRecord.h" +#include "../Biff_structures/FrtRefHeaderU.h" +#include "../Biff_structures/BiffString.h" namespace XLS { - -// Logical representation of Qsir record in BIFF8 class Qsir: public BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Qsir) @@ -47,11 +47,32 @@ public: ~Qsir(); BaseObjectPtr clone(); - void readFields(CFRecord& record); - static const ElementType type = typeQsir; + static const ElementType type = typeQsir; + + FrtRefHeaderU frtRefHeaderU; + unsigned short cbQsirSaved; + unsigned short cbQsifSaved; + bool fPersist; + bool fPersistSort; + bool fPersistAutoFilter; + bool fSorted; + bool fCaseSensSort; + bool fHdrRowSort; + bool fidWrapped; + bool fTitlesOld; + unsigned char wVerBeforeRefreshAlert; + _UINT32 iSortCustom; + _UINT32 cQsif; + _UINT32 cpstDeleted; + _UINT32 idFieldNext; + unsigned short ccolExtraLeft; + unsigned short ccolExtraRight; + _UINT32 idList; //options + + XLUnicodeString rgbTitle; }; } // namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp index 4315667d67..7f61c82383 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp @@ -52,7 +52,7 @@ BaseObjectPtr SortData::clone() void SortData::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") unsigned short flags; record >> flags; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp index 1c6b3c3d61..22167ea57b 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp @@ -53,7 +53,7 @@ BaseObjectPtr StyleExt::clone() void StyleExt::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") unsigned char flags; record >> flags; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp index d7f0a2a302..4fd89a36eb 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp @@ -53,7 +53,7 @@ BaseObjectPtr TableStyle::clone() void TableStyle::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") unsigned short flags; record >> flags; fIsPivot = GETBIT(flags, 1); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.cpp index 24de9f966e..fef34b15ab 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.cpp @@ -54,7 +54,7 @@ BaseObjectPtr TableStyleElement::clone() void TableStyleElement::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> tseType >> size >> index; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp index b41746b2b0..1e131d2127 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp @@ -53,7 +53,7 @@ BaseObjectPtr TableStyles::clone() void TableStyles::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") unsigned short cchDefTableStyle; unsigned short cchDefPivotStyle; diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TextPropsStream.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TextPropsStream.h index 0ce5a3c450..a41bcd5274 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TextPropsStream.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TextPropsStream.h @@ -31,8 +31,8 @@ */ #pragma once -#include #include "BiffRecord.h" +#include "../Biff_structures/FrtHeader.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.cpp index c6f9630e7b..3150a8dd2d 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.cpp @@ -55,7 +55,7 @@ BaseObjectPtr Theme::clone() void Theme::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record >> dwThemeVersion; if(!dwThemeVersion) diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.cpp index c4a78b16d1..589418f053 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.cpp @@ -53,7 +53,7 @@ BaseObjectPtr XFCRC::clone() void XFCRC::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record.skipNunBytes(2); // reserved record >> cxfs >> crc; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.cpp index fa00d94472..d2c704260f 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.cpp @@ -53,7 +53,7 @@ BaseObjectPtr XFExt::clone() void XFExt::readFields(CFRecord& record) { record.skipNunBytes(12); -#pragma message("############################ frtHeader skipped here") +#pragma message(">>>>>>>>>>> frtHeader skipped here") record.skipNunBytes(2); // reserved record >> ixfe; record.skipNunBytes(2); // reserved diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp index 94cde360be..6950e82754 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/ChartSheetSubstream.cpp @@ -124,104 +124,6 @@ CHARTSHEETCONTENT = [WriteProtect] [SheetExt] [WebPub] *HFPicture PAGESETUP Prin */ const bool ChartSheetSubstream::loadContent(BinProcessor& proc) { -// pGlobalWorkbookInfo = proc.getGlobalWorkbookInfo(); -// -// if(!proc.mandatory()) -// { -// return false; -// } -// int count = 0 ; -// -// proc.optional(); -// proc.optional(); -// proc.optional(); -// proc.repeated(0, 0); -// proc.mandatory(); -// proc.mandatory(); -// proc.optional(); -// -// if (proc.optional()) -// { -// m_BACKGROUND = elements_.back(); -// elements_.pop_back(); -// } -// -// count = proc.repeated(0, 0); -// while(count > 0) -// { -// m_arFbi.insert(m_arFbi.begin(), elements_.back()); -// elements_.pop_back(); -// count--; -// } -// count = proc.repeated(0, 0); -// -// while(count > 0 && m_arFbi.empty())//??? разделить -// { -// m_arFbi.insert(m_arFbi.begin(), elements_.back()); -// elements_.pop_back(); -// count--; -// } -// -// proc.optional(); -// proc.optional(); -// proc.optional(); -// proc.optional(); -// proc.optional(); -// proc.optional(); -// -// MsoDrawingGroup mso_drawing_group(true); -// proc.optional(mso_drawing_group); -// -// OBJECTS objects(true); -// if (proc.mandatory(objects)) -// { -// m_OBJECTSCHART = elements_.back(); -// elements_.pop_back(); -// } -// -// proc.mandatory(); -// if ( proc.mandatory() ) -// { -// m_CHARTFORMATS = elements_.back(); -// elements_.pop_back(); -// -// recalc((CHARTFORMATS*)m_CHARTFORMATS.get()); -// } -// if ( proc.mandatory() ) -// { -// m_SERIESDATA = elements_.back(); -// elements_.pop_back(); -// -// recalc((SERIESDATA*)m_SERIESDATA.get()); -// } -// -// count = proc.repeated(0, 0); -// while(count > 0) -// { -// m_arWINDOW.insert(m_arWINDOW.begin(), elements_.back()); -// elements_.pop_back(); -// count--; -// } -// -// count = proc.repeated(0, 0); -// while(count > 0) -// { -// m_arCUSTOMVIEW.insert(m_arCUSTOMVIEW.begin(), elements_.back()); -// elements_.pop_back(); -// count--; -// } -// -// proc.optional(); -// proc.optional(); -// -//#pragma message("####################### Some trash records may be skipped here") -// proc.SeekToEOF(); // Thus we skip problems with the trash at the end of the stream (found in Domens.xls) -// -// proc.mandatory(); -// -// return true; - -//------------------------------------------------------------------------------ pGlobalWorkbookInfo = proc.getGlobalWorkbookInfo(); int count = 0 ;