XlsFormat - external data records

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExtString.cpp

@@ -52,9 +52,9 @@ BaseObjectPtr ExtString::clone()
 
 void ExtString::readFields(CFRecord& record)
 {
-#pragma message("####################### ExtString record is not implemented")
-	Log::error("ExtString record is not implemented.");
-	//record >> some_value;
+	record >> frtHeaderOld >> string;
+	
+	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExtString.h

@@ -32,12 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeaderOld.h"
+#include "../Biff_structures/BiffString.h"
 
 namespace XLS
 {
 
-
-// Logical representation of ExtString record in BIFF8
 class ExtString: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ExtString)
@@ -47,12 +47,13 @@ public:
 	~ExtString();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeExtString;
+	static const ElementType type = typeExtString;
 
+	FrtHeaderOld	frtHeaderOld;
+	XLUnicodeString	string;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExternName.cpp

@@ -55,13 +55,14 @@ void ExternName::readFields(CFRecord& record)
 {
 	unsigned short flags;
 	record >> flags;
-	fBuiltIn = GETBIT(flags, 0);
+
+	fBuiltIn	= GETBIT(flags, 0);
 	fWantAdvise = GETBIT(flags, 1);
-	fWantPict = GETBIT(flags, 2);
-	fOle = GETBIT(flags, 3);
-	fOleLink = GETBIT(flags, 4);
-	cf = GETBITS(flags, 5, 14);
-	fIcon = GETBIT(flags, 15);
+	fWantPict	= GETBIT(flags, 2);
+	fOle		= GETBIT(flags, 3);
+	fOleLink	= GETBIT(flags, 4);
+	cf			= GETBITS(flags, 5, 14);
+	fIcon		= GETBIT(flags, 15);
 
 	if(0x3A01 == supbook_cch) // UDF reference on a XLL or COM add-in.
 	{
@@ -69,9 +70,6 @@ void ExternName::readFields(CFRecord& record)
 	}
 	else
 	{
-#pragma message("####################### ExternName record is not implemented")
-		Log::error("ExternName record is not implemented.");
-
 		if(fOle && !fOleLink) // DDE data item
 		{
 			body = BiffStructurePtr(new ExternDdeLinkNoOper);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.cpp

@@ -52,9 +52,7 @@ BaseObjectPtr FnGrp12::clone()
 
 void FnGrp12::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> astFnGrp;
+	record >> frtHeader >> astFnGrp;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FnGrp12.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of FnGrp12 record in BIFF8
 class FnGrp12: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(FnGrp12)
@@ -48,14 +47,14 @@ public:
 	~FnGrp12();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeFnGrp12;
+	static const ElementType type = typeFnGrp12;
 
 //-----------------------------
 	XLUnicodeString astFnGrp;
+	FrtHeader		frtHeader;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.cpp

@@ -52,11 +52,8 @@ BaseObjectPtr ForceFullCalculation::clone()
 
 void ForceFullCalculation::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-
 	_UINT32 temp;
-	record >> temp;
+	record >> frtHeader >> temp;
 	
 	fNoDeps = temp;
 }

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ForceFullCalculation.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of ForceFullCalculation record in BIFF8
 class ForceFullCalculation: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ForceFullCalculation)
@@ -51,10 +50,11 @@ public:
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeForceFullCalculation;
+	static const ElementType type = typeForceFullCalculation;
 
 //-----------------------------
-	bool fNoDeps;
+	bool		fNoDeps;
+	FrtHeader	frtHeader;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.cpp

@@ -52,10 +52,9 @@ BaseObjectPtr GUIDTypeLib::clone()
 
 void GUIDTypeLib::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
 	_GUID_ guid_num;
-	record >> guid_num;
+
+	record >> frtHeader >> guid_num;
 	guid = STR::guid2bstr(guid_num);
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/GUIDTypeLib.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of GUIDTypeLib record in BIFF8
 class GUIDTypeLib: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(GUIDTypeLib)
@@ -47,16 +46,14 @@ public:
 	~GUIDTypeLib();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeGUIDTypeLib;
+	static const ElementType type = typeGUIDTypeLib;
 
 //-----------------------------
-	std::wstring guid;
-
-
+	std::wstring	guid;
+	FrtHeader		frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.cpp

@@ -52,8 +52,8 @@ BaseObjectPtr MDB::clone()
 
 void MDB::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
+	record >> frtHeader;
+
 	while(!record.isEOF())
 	{
 		MDirPtr element(new MDir);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDB.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/MDir.h>
+#include "../Biff_structures/MDir.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of MDB record in BIFF8
 class MDB: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDB)
@@ -48,11 +47,11 @@ public:
 	~MDB();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
-	BiffStructurePtrVector rgmdir;
+	BiffStructurePtrVector	rgmdir;
+	FrtHeader				frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.cpp

@@ -52,11 +52,9 @@ BaseObjectPtr MDTInfo::clone()
 
 void MDTInfo::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	
 	_UINT32 flags;
-	record >> flags;
+
+	record >> frtHeader >> flags;
 	
 	fGhostRow = GETBIT(flags, 0);
 	fGhostCol = GETBIT(flags, 1);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDTInfo.h

@@ -32,13 +32,13 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
+
 
 namespace XLS
 {
 
-
-// Logical representation of MDTInfo record in BIFF8
 class MDTInfo: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDTInfo)
@@ -48,7 +48,6 @@ public:
 	~MDTInfo();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
@@ -79,7 +78,8 @@ public:
 	bool fAdjust;
 	bool fCellMeta;
 
-	LPWideString stName;
+	LPWideString	stName;
+	FrtHeader		frtHeader;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.cpp

@@ -52,9 +52,7 @@ BaseObjectPtr MDXKPI::clone()
 
 void MDXKPI::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> istrConnName >> tfnSrc >> kpiprop >> istrKPIName >> istrMbrKPI;
+	record >> frtHeader >> istrConnName >> tfnSrc >> kpiprop >> istrKPIName >> istrMbrKPI;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXKPI.h

@@ -32,12 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
 
-// Logical representation of MDXKPI record in BIFF8
 class MDXKPI: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDXKPI)
@@ -47,7 +47,6 @@ public:
 	~MDXKPI();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
@@ -56,6 +55,7 @@ public:
 	unsigned char	kpiprop;
 	_INT32			istrKPIName;
 	_INT32			istrMbrKPI;
+	FrtHeader		frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.cpp

@@ -50,12 +50,9 @@ BaseObjectPtr MDXProp::clone()
 	return BaseObjectPtr(new MDXProp(*this));
 }
 
-
 void MDXProp::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> istrConnName >> tfnSrc >> istrMbr >> istrProp;
+	record >> frtHeader >> istrConnName >> tfnSrc >> istrMbr >> istrProp;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXProp.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of MDXProp record in BIFF8
 class MDXProp: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDXProp)
@@ -47,14 +46,14 @@ public:
 	~MDXProp();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
-	_INT32	istrConnName;
+	_INT32			istrConnName;
 	unsigned char	tfnSrc;
-	_UINT32	istrMbr;
-	_UINT32	istrProp;
+	_UINT32			istrMbr;
+	_UINT32			istrProp;
+	FrtHeader		frtHeader;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.cpp

@@ -50,12 +50,10 @@ BaseObjectPtr MDXSet::clone()
 	return BaseObjectPtr(new MDXSet(*this));
 }
 
-
 void MDXSet::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> istrConnName >> tfnSrc >> sso >> istrSetDef >> cistr;
+	record >> frtHeader >> istrConnName >> tfnSrc >> sso >> istrSetDef >> cistr;
+	
 	while(!record.isEOF())
 	{
 		MDXStrIndexPtr element(new MDXStrIndex);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXSet.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/MDXStrIndex.h>
+#include "../Biff_structures/MDXStrIndex.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of MDXSet record in BIFF8
 class MDXSet: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDXSet)
@@ -48,16 +47,16 @@ public:
 	~MDXSet();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
-	_INT32	istrConnName;
-	unsigned char	tfnSrc;
-	unsigned char	sso;
-	_UINT32	istrSetDef;
-	_INT32	cistr;
-	BiffStructurePtrVector rgistr;
+	_INT32					istrConnName;
+	unsigned char			tfnSrc;
+	unsigned char			sso;
+	_UINT32					istrSetDef;
+	_INT32					cistr;
+	BiffStructurePtrVector	rgistr;
+	FrtHeader				frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.cpp

@@ -50,12 +50,9 @@ BaseObjectPtr MDXStr::clone()
 	return BaseObjectPtr(new MDXStr(*this));
 }
 
-
 void MDXStr::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> st;
+	record >> frtHeader >> st;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXStr.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of MDXStr record in BIFF8
 class MDXStr: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDXStr)
@@ -52,7 +51,8 @@ public:
 	
 	void readFields(CFRecord& record);
 //-----------------------------
-	LPWideString st;
+	LPWideString	st;
+	FrtHeader		frtHeader;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.cpp

@@ -50,12 +50,10 @@ BaseObjectPtr MDXTuple::clone()
 	return BaseObjectPtr(new MDXTuple(*this));
 }
 
-
 void MDXTuple::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> istrConnName >> tfnSrc >> cistr;
+	record >> frtHeader >> istrConnName >> tfnSrc >> cistr;
+
 	while(!record.isEOF())
 	{
 		MDXStrIndexPtr element(new MDXStrIndex);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MDXTuple.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/MDXStrIndex.h>
+#include "../Biff_structures/MDXStrIndex.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of MDXTuple record in BIFF8
 class MDXTuple: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MDXTuple)
@@ -48,18 +47,17 @@ public:
 	~MDXTuple();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeMDXTuple;
 
 //-----------------------------
-	_INT32	istrConnName;
-	unsigned char	tfnSrc;
-	_INT32	cistr;
-	BiffStructurePtrVector rgistr;
-
+	_INT32					istrConnName;
+	unsigned char			tfnSrc;
+	_INT32					cistr;
+	BiffStructurePtrVector	rgistr;
+	FrtHeader				frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.cpp

@@ -44,7 +44,6 @@ NameFnGrp12::~NameFnGrp12()
 {
 }
 
-
 BaseObjectPtr NameFnGrp12::clone()
 {
 	return BaseObjectPtr(new NameFnGrp12(*this));
@@ -52,9 +51,7 @@ BaseObjectPtr NameFnGrp12::clone()
 
 void NameFnGrp12::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> cachName >> fgrp >> rgach;
+	record >> frtHeader >> cachName >> fgrp >> rgach;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NameFnGrp12.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of NameFnGrp12 record in BIFF8
 class NameFnGrp12: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(NameFnGrp12)
@@ -48,15 +47,14 @@ public:
 	~NameFnGrp12();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 //-----------------------------
-	_UINT16 cachName;
-	_UINT16 fgrp;
+	_UINT16			cachName;
+	_UINT16			fgrp;
 
 	XLUnicodeString rgach;
-
+	FrtHeader		frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.cpp

@@ -44,7 +44,6 @@ NamePublish::~NamePublish()
 {
 }
 
-
 BaseObjectPtr NamePublish::clone()
 {
 	return BaseObjectPtr(new NamePublish(*this));
@@ -52,10 +51,10 @@ BaseObjectPtr NamePublish::clone()
 
 void NamePublish::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
 	unsigned short flags;
-	record >> flags >> strName;
+
+	record >> frtHeader >> flags >> strName;
+
 	fPublished = GETBIT(flags, 0);
 	fWorkbookParam = GETBIT(flags, 0);
 }

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/NamePublish.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of NamePublish record in BIFF8
 class NamePublish: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(NamePublish)
@@ -48,17 +47,17 @@ public:
 	~NamePublish();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeNamePublish;
 
 //-----------------------------
-	bool fPublished;
-	bool fWorkbookParam;
+	bool			fPublished;
+	bool			fWorkbookParam;
 
 	XLUnicodeString strName;
+	FrtHeader		frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp

@@ -39,7 +39,6 @@ SortData::SortData()
 {
 }
 
-
 SortData::~SortData()
 {
 }
@@ -51,11 +50,9 @@ BaseObjectPtr SortData::clone()
 
 void SortData::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	
 	unsigned short flags;
-	record >> flags;
+
+	record >> frtHeader >> flags;
 
 	fCol			= GETBIT(flags, 0);
 	fCaseSensitive	= GETBIT(flags, 1);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.h

@@ -32,8 +32,9 @@
 #pragma once
 
 #include "BiffRecordContinued.h"
-#include <Logic/Biff_structures/CellRangeRef.h>
-#include <Logic/Biff_structures/SortCond12.h>
+#include "../Biff_structures/CellRangeRef.h"
+#include "../Biff_structures/SortCond12.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
@@ -60,7 +61,8 @@ public:
 	BIFF_DWORD		cconditions;
 	BIFF_DWORD		idParent;
 
-	BiffStructurePtrVector sortCond12Array;
+	BiffStructurePtrVector	sortCond12Array;
+	FrtHeader				frtHeader;
 
 //-----------------------------
 	std::wstring	rfx;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.cpp

@@ -52,10 +52,8 @@ BaseObjectPtr StyleExt::clone()
 
 void StyleExt::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
 	unsigned char flags;
-	record >> flags;
+	record >> frtHeader >> flags;
 	
 	fBuiltIn	= GETBIT(flags, 0);
 	fHidden		= GETBIT(flags, 1);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/StyleExt.h

@@ -32,9 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BuiltInStyle.h>
-#include <Logic/Biff_structures/BiffString.h>
-#include <Logic/Biff_structures/XFProps.h>
+
+#include "../Biff_structures/BuiltInStyle.h"
+#include "../Biff_structures/XFProps.h"
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
@@ -67,6 +69,8 @@ public:
 	BuiltInStyle	builtInData;
 	LPWideString	stName;
 	XFProps			xfProps;
+
+	FrtHeader		frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp

@@ -52,12 +52,13 @@ BaseObjectPtr TableStyle::clone()
 
 void TableStyle::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
 	unsigned short flags;
-	record >> flags;
+
+	record >> frtHeader >> flags;
+
 	fIsPivot = GETBIT(flags, 1);
 	fIsTable = GETBIT(flags, 2);
+
 	unsigned short cchName;
 	record >> ctse >> cchName;
 	rgchName.setSize(cchName);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of TableStyle record in BIFF8
 class TableStyle: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(TableStyle)
@@ -49,18 +48,16 @@ public:
 
 	BaseObjectPtr clone();
 
-	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeTableStyle;
 
 //-----------------------------
-	bool fIsPivot;
-	bool fIsTable;
-	_UINT32	ctse;
-	LPWideStringNoCch rgchName;
-
-
+	bool				fIsPivot;
+	bool				fIsTable;
+	_UINT32				ctse;
+	LPWideStringNoCch	rgchName;
+	FrtHeader			frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.cpp

@@ -39,23 +39,18 @@ TableStyleElement::TableStyleElement()
 {
 }
 
-
 TableStyleElement::~TableStyleElement()
 {
 }
 
-
 BaseObjectPtr TableStyleElement::clone()
 {
 	return BaseObjectPtr(new TableStyleElement(*this));
 }
 
-
 void TableStyleElement::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> tseType >> size >> index;
+	record >> frtHeader >> tseType >> size >> index;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of TableStyleElement record in BIFF8
 class TableStyleElement: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(TableStyleElement)
@@ -47,17 +46,16 @@ public:
 	~TableStyleElement();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeTableStyleElement;
 
 //-----------------------------
-	_UINT32	tseType;
-	_UINT32	size;
-	_UINT32	index;
-
+	_UINT32		tseType;
+	_UINT32		size;
+	_UINT32		index;
+	FrtHeader	frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp

@@ -39,12 +39,10 @@ TableStyles::TableStyles()
 {
 }
 
-
 TableStyles::~TableStyles()
 {
 }
 
-
 BaseObjectPtr TableStyles::clone()
 {
 	return BaseObjectPtr(new TableStyles(*this));
@@ -52,12 +50,9 @@ BaseObjectPtr TableStyles::clone()
 
 void TableStyles::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	
 	unsigned short cchDefTableStyle;
 	unsigned short cchDefPivotStyle;
-	record >> cts >> cchDefTableStyle >> cchDefPivotStyle;
+	record >> frtHeader >> cts >> cchDefTableStyle >> cchDefPivotStyle;
 	
 	rgchDefTableStyle.setSize(cchDefTableStyle);
 	rgchDefPivotStyle.setSize(cchDefPivotStyle);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.h

@@ -32,12 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/BiffString.h>
+#include "../Biff_structures/BiffString.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-// Logical representation of TableStyles record in BIFF8
 class TableStyles: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(TableStyles)
@@ -50,13 +50,13 @@ public:
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeTableStyles;
+	static const ElementType type = typeTableStyles;
 
 //-----------------------------
-	_UINT32	cts;
-	LPWideStringNoCch rgchDefTableStyle;
-	LPWideStringNoCch rgchDefPivotStyle;
-
+	_UINT32				cts;
+	LPWideStringNoCch	rgchDefTableStyle;
+	LPWideStringNoCch	rgchDefPivotStyle;
+	FrtHeader			frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.cpp

@@ -41,12 +41,10 @@ Theme::Theme()
 {
 }
 
-
 Theme::~Theme()
 {
 }
 
-
 BaseObjectPtr Theme::clone()
 {
 	return BaseObjectPtr(new Theme(*this));
@@ -54,9 +52,7 @@ BaseObjectPtr Theme::clone()
 
 void Theme::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
-	record >> dwThemeVersion;
+	record >> frtHeader >> dwThemeVersion;
 
 	if(!dwThemeVersion)
 	{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Theme.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of Theme record in BIFF8
 class Theme: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Theme)
@@ -53,9 +52,8 @@ public:
 	static const ElementType	type = typeTheme;
 
 //-----------------------------
-	_UINT32	dwThemeVersion;
-	//std::wstring rgb;
-
+	_UINT32		dwThemeVersion;
+	FrtHeader	frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.cpp

@@ -39,12 +39,10 @@ XFCRC::XFCRC()
 {
 }
 
-
 XFCRC::~XFCRC()
 {
 }
 
-
 BaseObjectPtr XFCRC::clone()
 {
 	return BaseObjectPtr(new XFCRC(*this));
@@ -52,8 +50,7 @@ BaseObjectPtr XFCRC::clone()
 
 void XFCRC::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
+	record >> frtHeader;
 	record.skipNunBytes(2); // reserved
 	record >> cxfs >> crc;
 }

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFCRC.h

@@ -32,12 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of XFCRC record in BIFF8
 class XFCRC: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(XFCRC)
@@ -50,12 +49,12 @@ public:
 
 	void readFields(CFRecord& record);
 	
-	static const ElementType	type = typeXFCRC;
+	static const ElementType type = typeXFCRC;
 
 //-----------------------------
-	_UINT16 cxfs;
-	_UINT32	crc;
-
+	_UINT16		cxfs;
+	_UINT32		crc;
+	FrtHeader	frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.cpp

@@ -39,12 +39,10 @@ XFExt::XFExt()
 {
 }
 
-
 XFExt::~XFExt()
 {
 }
 
-
 BaseObjectPtr XFExt::clone()
 {
 	return BaseObjectPtr(new XFExt(*this));
@@ -52,8 +50,7 @@ BaseObjectPtr XFExt::clone()
 
 void XFExt::readFields(CFRecord& record)
 {
-	record.skipNunBytes(12);
-#pragma message(">>>>>>>>>>> frtHeader skipped here")
+	record >> frtHeader;
 	record.skipNunBytes(2); // reserved
 	record >> ixfe;
 	record.skipNunBytes(2); // reserved

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XFExt.h

@@ -32,13 +32,12 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/ExtProp.h>
+#include "../Biff_structures/ExtProp.h"
+#include "../Biff_structures/FrtHeader.h"
 
 namespace XLS
 {
 
-
-// Logical representation of XFExt record in BIFF8
 class XFExt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(XFExt)
@@ -51,13 +50,13 @@ public:
 
 	void readFields(CFRecord& record);
 	
-	static const ElementType	type = typeXFExt;
+	static const ElementType type = typeXFExt;
 
 //-----------------------------
 	_UINT16					ixfe;
 	_UINT16					cexts;
 	BiffStructurePtrVector	rgExt;
-
+	FrtHeader				frtHeader;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ControlInfo.h

@@ -49,8 +49,6 @@ public:
 	
 	virtual void load(CFRecord& record);
 
-
-
 	unsigned char	fDefault;
 	unsigned char	fHelp;
 	unsigned char	fCancel;