XlsFile2 - картинки

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63801 954022d7-b5bf-4e40-9824-e11837661b57

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

@@ -11,11 +11,10 @@ class BopPopCustomPiesIndices : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual const bool fromXML(MSXML2::IXMLDOMElementPtr xml_tag){return false;}
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record){}
 
+	static const ElementType	type = typeBopPopCustomPiesIndices;
 //-----------------------------
 	std::vector<unsigned short> pie_indices;
 };

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

@@ -17,6 +17,7 @@ public:
 	virtual void load(CFRecord& record) {};
 	virtual void store(CFRecord& record){};
 
+	static const ElementType	type = typeIXFCellMulBlankSpecial;
 //-----------------------------
 	unsigned short common_ixfe;
 	std::vector<unsigned short> rgixfe;

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

@@ -11,14 +11,12 @@ class RGISeriesListSpecial : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual const bool fromXML(MSXML2::IXMLDOMElementPtr xml_tag);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
 	static const ElementType	type = typeRGISeriesListSpecial;
 
-//-----------------------------
+	//-----------------------------
 	std::vector<unsigned short> series;
 };
 

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

@@ -16,12 +16,12 @@ public:
 	AF12Criteria();
 	~AF12Criteria();
 
-	
-	
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
+	static const ElementType	type = typeAF12Criteria;
+
 	AFDOper doper;
 	XLUnicodeStringNoCch str;
 	BIFF_BSTR _str;

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

@@ -17,16 +17,15 @@ public:
 	AFDOper(bool bAutoFilter);
 	~AFDOper();
 
-	
-	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
+	static const ElementType	type = typeAFDOper;
+
 	BIFF_BYTE vt;
 	BIFF_BYTE grbitSign;
 	AFDOperStr vtValue;
 
-public:
 	bool m_bAutoFilter;
 };
 

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

@@ -17,7 +17,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);	
 
-public:
+	static const ElementType	type = typeAFDOperRk;
+
 	BIFF_DWORD rk;
 };
 

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

@@ -17,6 +17,7 @@ public:
 	AFDOperStr(bool bAutoFilter);
 	~AFDOperStr();
 
+	static const ElementType	type = typeAFDOperStr;
 	
 	
 	virtual void load(CFRecord& record);
@@ -25,7 +26,6 @@ public:
 	BIFF_BYTE cch;
 	BIFF_BYTE fCompare;	
 
-public:
 	bool m_bAutoFilter;
 };
 

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

@@ -13,13 +13,12 @@ class AddinUdf : public BiffStructure
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(AddinUdf)
 public:
 	BiffStructurePtr clone();
-
-	
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeAddinUdf;
+
 	ShortXLUnicodeString udfName;
 };
 

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

@@ -13,8 +13,8 @@ class AntiMoniker : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	
-	
+	static const XLS::ElementType	type = XLS::typeAntiMoniker;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -14,6 +14,7 @@ class Bes : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
+	static const ElementType	type = typeBes;
 	
 	
 	virtual void load(CFRecord& record);

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

@@ -17,6 +17,7 @@ public:
 	{
 		attrib_name = name_init;
 	}
+	static const ElementType	type = typeBiffAttribute;
 
 	_CP_OPT(std::wstring) attrib_name;
 };

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

@@ -37,8 +37,7 @@ public:
 	virtual void load(CFRecord& record) = 0;
 	virtual void store(CFRecord& record) = 0;
 	
-	static const ElementType	type = typeBiffStructure;
-	virtual ElementType			get_type() const { return type; }
+	virtual ElementType get_type() = 0;
 
 	virtual int serialize(std::wostream & _stream)
 	{
@@ -54,7 +53,8 @@ public:
 
 #define BASE_STRUCTURE_DEFINE_CLASS_NAME(class_name)\
 	public: \
-		const std::wstring & getClassName() const { static std::wstring  str(L# class_name); return str; };
+		const std::wstring & getClassName() const { static std::wstring  str(L# class_name); return str; };\
+		virtual XLS::ElementType get_type() { return type; }
 	
 
 

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

@@ -13,12 +13,12 @@ class BookExt_Conditional11 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
+	static const ElementType	type = typeBookExt_Conditional11;
 	
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool fBuggedUserAboutSolution;
 	bool fShowInkAnnotation;
 };

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

@@ -13,12 +13,11 @@ class BookExt_Conditional12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeBookExt_Conditional12;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool fPublishedBookItems;
 	bool fShowPivotChartFilter;
 };

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

@@ -13,7 +13,7 @@ class BuiltInStyle : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeBuiltInStyle;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -17,12 +17,11 @@ public:
 	CFColor(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeCFColor;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	XColorType xclrType;
 	ColorICV icv;
 	LongRGBA rgb;

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

@@ -15,12 +15,11 @@ class CFExNonCF12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCFExNonCF12;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short icf;
 	unsigned char cp;
 	unsigned char icfTemplate;

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

@@ -100,7 +100,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeCFExTemplateParams;
+
 	union
 	{
 		CFExFilterParams filter;

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

@@ -15,12 +15,12 @@ class CFMStateItem : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCFMStateItem;
+
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	CFVO cfvo;
 	Boolean<unsigned char> fEqual;
 };

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

@@ -14,7 +14,7 @@ class CFMultistate : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCFMultistate;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -14,7 +14,7 @@ class CFVO : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCFVO;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -23,6 +23,8 @@ public:
 
 	const CellRef getLocation() const;
 
+	static const ElementType	type = typeCell;
+
 	Rw rw;
 	Col col;
 	IXFCell ixfe;

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

@@ -23,10 +23,9 @@ public:
 
 	static void resend(CFStream& stream, const unsigned int data_place, const unsigned int data);
 
-private:
+	static const ElementType	type = typeCellOffsetResender;
 	 // Stubbed to make class non-abstract
 
-private:
 	bool row_starts;
 };
 

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

@@ -25,8 +25,7 @@ public:
 
 	BiffStructurePtr clone();
 
-	
-	
+	static const ElementType	type = typeCellRangeRef;
 
 	const std::wstring toString(const bool useShortForm = true) const;
 	void fromString(const std::wstring& str);

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

@@ -16,7 +16,7 @@ public:
 
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCellRef;
 	
 
 	const std::wstring toString() const;

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

@@ -21,6 +21,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
+	static const ElementType	type = typeCellXF;
+
 	GlobalWorkbookInfoPtr m_GlobalWorkbookInfo;
 	
 	int serialize(std::wostream & stream);

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

@@ -16,12 +16,11 @@ public:
 	CompositeMoniker(XLS::CFRecord& record);
 	XLS::BiffStructurePtr clone();
 
-	
+	static const XLS::ElementType	type = XLS::typeCompositeMoniker;
 	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	std::vector<HyperlinkMoniker> monikerArray;
 };
 

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

@@ -14,7 +14,7 @@ class CondFmtStructure : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeCondFmtStructure;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -14,7 +14,7 @@ class ControlInfo : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeControlInfo;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -12,13 +12,12 @@ class DXFALC : public BiffStructure
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(DXFALC)
 public:
 	BiffStructurePtr clone();
-
-	
 	
+	static const ElementType	type = typeDXFALC;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned char alc;
 	bool fWrap;
 	unsigned char alcv;

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

@@ -13,12 +13,11 @@ class DXFBdr : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFBdr;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned char dgLeft;
 	unsigned char dgRight;
 	unsigned char dgTop;

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

@@ -16,12 +16,11 @@ class DXFFntD : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFFntD;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	XLUnicodeStringNoCch stFontName;
 	Stxp stxp;
 	long icvFore;

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

@@ -17,12 +17,11 @@ public:
 	DXFId(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeDXFId;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int index;
 };
 

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

@@ -19,12 +19,11 @@ class DXFN : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFN;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool alchNinch;
 	bool alcvNinch;
 	bool wrapNinch;

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

@@ -15,12 +15,11 @@ class DXFN12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFN12;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int cbDxf;
 	DXFNPtr dxfn;
 	XFExtNoFRTPtr xfext;

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

@@ -17,12 +17,11 @@ public:
 	DXFN12List();
 	~DXFN12List();
 
-	
+	static const ElementType	type = typeDXFN12List;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	DXFN dxfn;
 	XFExtNoFRT xfext;
 };

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

@@ -15,7 +15,7 @@ class DXFNum : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFNum;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
@@ -23,7 +23,6 @@ public:
 	void setIsUserDefined(const bool is_user_defined); 
 	const bool getIsUserDefined() const; 
 
-private:
 	_CP_OPT(bool)	is_user_defined_;
 	DXFNumIFmt		fmt_id;
 	DXFNumUsr		user_defined;

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

@@ -15,12 +15,11 @@ public:
 	DXFNumUsr();
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeDXFNumUsr;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short cb;
 	XLUnicodeString fmt;
 };

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

@@ -14,12 +14,11 @@ class DXFPat : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFPat;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	FillPattern fls;
 	unsigned char icvForeground;
 	unsigned char icvBackground;

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

 #pragma once
 
 #include "BiffStructure.h"
-//#include <Logic/Biff_structures/Phs.h>
-//#include <Logic/Biff_structures/BiffString.h>
 
 namespace XLS
 {;
@@ -15,12 +13,11 @@ class DXFProt : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeDXFProt;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool fLocked;
 	bool fHidden;
 };

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

@@ -14,12 +14,11 @@ class DropDownObjId : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeDropDownObjId;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	ObjId id;
 };
 

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

@@ -14,12 +14,11 @@ class EncryptionHeader : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const XLS::ElementType	type = XLS::typeEncryptionHeader;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	EncryptionHeaderFlags Flags;
 	long AlgID;
 	long AlgIDHash;

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

@@ -15,12 +15,11 @@ class EncryptionHeaderFlags : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const XLS::ElementType	type = XLS::typeEncryptionHeaderFlags;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	bool fCryptoAPI;
 	bool fDocProps;
 	bool fExternal;

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

@@ -13,12 +13,11 @@ class EncryptionVerifier : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const XLS::ElementType	type = XLS::typeEncryptionVerifier;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	unsigned int SaltSize;
 	struct SALT_TAG {
 		unsigned int b1;

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

@@ -15,12 +15,11 @@ public:
 	EnhancedProtection(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeEnhancedProtection;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool iprotObjects;
 	bool iprotScenarios;
 	bool iprotFormatCells;

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

@@ -18,6 +18,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
+	static const ElementType	type = typeExtProp;
+
 	unsigned short extType;
 	unsigned short cb;
 	

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

@@ -16,14 +16,13 @@ class ExtRst : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeExtRst;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
 	const size_t getSize() const;
 
-private:
 	unsigned short cb;
 	Phs phs;
 	RPHSSub rphssub;

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

@@ -14,12 +14,11 @@ class ExternDdeLinkNoOper : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeExternDdeLinkNoOper;
+
 	ShortXLUnicodeString linkName;
 };
 

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

@@ -15,12 +15,11 @@ class ExternDocName : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeExternDocName;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short ixals;
 	ShortXLUnicodeString extName;
 	ExtNameParsedFormula nameDefinition;

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

@@ -15,12 +15,11 @@ class ExternOleDdeLink : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeExternOleDdeLink;
+
 	unsigned int lStgName;
 	ShortXLUnicodeString linkName;
 	MOper moper;

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

@@ -17,12 +17,11 @@ public:
 	FactoidData(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeFactoidData;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	bool fDelete;
 	bool fXMLBased;
 	OSHARED::PropertyBag propertyBag;

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

@@ -15,12 +15,11 @@ class FactoidType : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const XLS::ElementType	type = XLS::typeFactoidType;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	unsigned int id;
 	PBString rgbUri;
 	PBString rgbTag;

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

@@ -16,12 +16,11 @@ class Feat11FdaAutoFilter : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFeat11FdaAutoFilter;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	BIFF_DWORD cbAutoFilter;
 	AutoFilter recAutoFilter;
 };

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

@@ -16,12 +16,11 @@ class Feat11FieldDataItem : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFeat11FieldDataItem;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	BIFF_DWORD idField;
 	BIFF_DWORD lfdt;
 	BIFF_DWORD lfxidt;

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

@@ -16,12 +16,11 @@ public:
 	FeatFormulaErr2(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeFeatFormulaErr2;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	FFErrorCheck grffecIgnore;
 };
 

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

@@ -17,12 +17,11 @@ public:
 	FeatProtection(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeFeatProtection;
+
 	bool fSD;
 	unsigned int wPassword;
 	XLUnicodeString stTitle;

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

@@ -17,12 +17,11 @@ public:
 	FeatSmartTag(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeFeatSmartTag;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int hashValue;
 	std::vector<FactoidData> rgFactoid;
 };

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

@@ -15,6 +15,8 @@ public:
 	FileMoniker(XLS::CFRecord& record);
 	XLS::BiffStructurePtr clone();
 
+	static const XLS::ElementType	type = XLS::typeFileMoniker;
+
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -13,12 +13,11 @@ class FileOffset : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFileOffset;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short offset;
 };
 

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

@@ -16,12 +16,11 @@ public:
 
 	BiffStructurePtr clone();
 
-	
-	
+	static const ElementType	type = typeFilePointer;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int offset;
 };
 

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

@@ -14,12 +14,11 @@ class FormatRun : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFormatRun;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short ich;
 	FontIndex ifnt;
 };

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

@@ -22,8 +22,8 @@ public:
 	virtual void store(CFRecord& record);
 
 	
+	static const ElementType	type = typeFrtHeader;
 	
-private:
 	CFRecordType::TypeId rt;
 	FrtFlags grbitFrt;
 };

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

@@ -18,12 +18,11 @@ public:
 
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFrtHeaderOld;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	CFRecordType::TypeId rt;
 	FrtFlags grbitFrt;
 };

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

@@ -16,7 +16,7 @@ class FrtRefHeader : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFrtRefHeader;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);

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

@@ -19,12 +19,11 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeFrtRefHeaderNoGrbit;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	CFRecordType::TypeId rt;
 	Ref8U ref8;
 };

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

@@ -16,12 +16,11 @@ class FrtRefHeaderU : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeFrtRefHeaderU;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	CFRecordType::TypeId rt;
 	FrtFlags grbitFrt;
 	Ref8U ref8;

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

@@ -13,12 +13,11 @@ class FtCblsData : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtCblsData;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short fChecked;
 	unsigned short accel;
 	bool fNo3d;

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

@@ -17,12 +17,11 @@ public:
 	}
 
 	BiffStructurePtr clone();
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtCf;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short cf;
 };
 

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

@@ -16,7 +16,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
+	static const ElementType	type = typeFtCmo;
+
 	unsigned short ot;
 	unsigned short id;
 

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

@@ -14,12 +14,11 @@ class FtEdoData : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtEdoData;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short ivtEdit;
 	Boolean<unsigned short> fMultiLine;
 	unsigned short fVScroll;

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

@@ -14,12 +14,11 @@ class FtGboData : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
+	static const ElementType	type = typeFtGboData;
+
 	unsigned short accel;
 	bool fNo3d;
 };

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

@@ -18,16 +18,14 @@ public:
 	FtLbsData();
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtLbsData;
+
 	virtual void load(CFRecord& record, const unsigned short ot);
 	virtual void store(CFRecord& record, const unsigned short ot);
 
-private:
 	virtual void load(CFRecord& record){}
 	virtual void store(CFRecord& record){}
 
-private:
 	ObjFmla fmla;
 	unsigned short cLines;
 	unsigned short iSel;

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

@@ -15,12 +15,11 @@ public:
 	FtMacro();
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtMacro;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	ObjFmla fmla;
 };
 

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

@@ -14,12 +14,11 @@ class FtNts : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtNts;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	std::wstring  guid;
 	Boolean<unsigned short> fSharedNote;
 };

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

@@ -17,15 +17,14 @@ public:
 	FtPictFmla();
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
 	virtual void load(CFRecord& record, FtPioGrbit& pictFlags);
 	virtual void store(CFRecord& record, FtPioGrbit& pictFlags);
-private:
+
+	static const ElementType	type = typeFtPictFmla;
+
 	virtual void load(CFRecord& record){}
 	virtual void store(CFRecord& record){}
 
-private:
 	ObjFmla fmla;
 	unsigned int lPosInCtlStm;
 	unsigned int cbBufInCtlStm;

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

@@ -13,12 +13,11 @@ class FtPioGrbit : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtPioGrbit;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	bool fAutoPict;
 	bool fDde;
 	bool fPrintCalc;

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

@@ -14,12 +14,11 @@ class FtRboData : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtRboData;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned short idRadNext;
 	Boolean<unsigned short> fFirstBtn;
 };

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

@@ -14,16 +14,14 @@ class FtSbs : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeFtSbs;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	unsigned short ft;
 	unsigned short cb;
 
-private:
 	short iVal;
 	short iMin;
 	short iMax;

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

@@ -21,12 +21,8 @@ public:
 	const unsigned short getIndex() const;
 	const bool isMacro() const;
 
-	//void toXML(BiffStructurePtr & parent);
-
-public:
 	static const unsigned short recognizeFunction(const std::wstring& word);
 
-private:
 	class ValuesDetermination
 	{
 	public:
@@ -35,7 +31,6 @@ private:
 		static const unsigned short getIndex(const std::wstring& func_name);
 		static const long getParamsNum(const std::wstring& func_name);
 
-	private:
 		ValuesDetermination();
 		static ValuesDetermination& getInst()
 		{
@@ -58,11 +53,9 @@ private:
 		> ParamsFixedSet;
 
 
-	private:
 		ParamsFixedSet params_fixed;
 	};
 
-private:
 	unsigned short func_index;
 };
 #pragma pack() // restore

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

@@ -16,6 +16,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
+	static const ElementType	type = typeFullColorExt;
+
 	unsigned char	icv;
 	unsigned char	xclrType;
 	short			nTintShade;

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

@@ -17,6 +17,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
+	static const ElementType	type = typeGradStop;
+
 	unsigned short xclrType;
 	unsigned int xclrValue;
 	LongRGBA xclrValue_rgb;

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

@@ -14,12 +14,11 @@ class HorzBrk : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeHorzBrk;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	RwU row;
 	unsigned short colStart;
 	unsigned short colEnd;

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

@@ -16,6 +16,8 @@ public:
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
+	static const XLS::ElementType	type = XLS::typeHyperlinkMoniker;
+
 	std::wstring  monikerClsid;
 	boost::shared_ptr<BiffStructure> data;
 };

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

@@ -20,6 +20,8 @@ public:
 
 	unsigned int streamVersion;
 
+	static const XLS::ElementType	type = XLS::typeHyperlinkObject;
+
 	bool hlstmfHasMoniker;
 	bool hlstmfIsAbsolute;
 	bool hlstmfSiteGaveDisplayName;

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

@@ -13,12 +13,11 @@ class ISSTInf : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeISSTInf;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int ib;
 	unsigned short cbOffset;
 };

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

@@ -15,12 +15,11 @@ public:
 	ItemMoniker(XLS::CFRecord& record);
 	XLS::BiffStructurePtr clone();
 
-	
+	static const XLS::ElementType	type = XLS::typeItemMoniker;
 	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-private:
 	std::string delimiterAnsi;
 	std::wstring delimiterUnicode;
 	std::string itemAnsi;

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

@@ -14,12 +14,11 @@ class LbsDropData : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr own_tag);
+	static const ElementType	type = typeLbsDropData;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned char wStyle;
 	bool fFiltered;
 

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

@@ -16,12 +16,11 @@ public:
 	List12BlockLevel();
 	~List12BlockLevel();
 
-	
+	static const ElementType	type = typeList12BlockLevel;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	BIFF_DWORD cbdxfHeader;
 	BIFF_DWORD istnHeader;
 	BIFF_DWORD cbdxfData;

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

@@ -16,12 +16,11 @@ public:
 	List12DisplayName();
 	~List12DisplayName();
 
-	
+	static const ElementType	type = typeList12DisplayName;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	XLNameUnicodeString stListName;
 	XLUnicodeString stListComment;
 };

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

@@ -16,12 +16,11 @@ public:
 	List12TableStyleClientInfo();
 	~List12TableStyleClientInfo();
 
-	
+	static const ElementType	type = typeList12TableStyleClientInfo;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-public:
 	BIFF_BYTE fFirstColumn;
 	BIFF_BYTE fLastColumn;
 	BIFF_BYTE fRowStripes;

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

@@ -15,19 +15,17 @@ public:
 	LongRGBA(const bool alpha_present);
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeLongRGBA;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-protected:
 	unsigned char red;
 	unsigned char green;
 	unsigned char blue;
 	unsigned char alpha;
 	std::wstring  argb;
 
-private:
 	bool is_alpha;
 };
 

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

@@ -13,12 +13,11 @@ class MDXStrIndex : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	
+	static const ElementType	type = typeMDXStrIndex;
 	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	unsigned int index;
 };
 

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

@@ -13,12 +13,11 @@ class MDir : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeMDir;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	long imdt;
 	unsigned short mdd;
 };

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

@@ -15,12 +15,11 @@ class MOper : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeMOper;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	ColunByteU colLast;
 	RwU rowLast;
 	std::vector<SerArPtr> extOper;

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

@@ -18,12 +18,11 @@ public:
 	NoteRR(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void toXML(BiffStructurePtr & parent);
-	//virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeNoteRR;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	RRD rrd;
 	bool bitfDelNote;
 	bool bitfAddNote;

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

@@ -17,12 +17,11 @@ public:
 	NoteSh(CFRecord& record);
 	BiffStructurePtr clone();
 
-	////virtual void toXML(BiffStructurePtr & parent);
-	////virtual const bool fromXML(BiffStructurePtr & parent);
+	static const ElementType	type = typeNoteSh;
+
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-private:
 	Rw row;
 	Col col;
 	bool fShow;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h

@@ -18,6 +18,8 @@ class IMsoArray : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone(){return XLS::BiffStructurePtr(new IMsoArray(*this));}
 
+	static const XLS::ElementType	type = XLS::typeIMsoArray;
+
 	virtual void load(XLS::CFRecord& record)
 	{
 		unsigned short nElems, nElemsAlloc;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOCR.h

@@ -19,6 +19,8 @@ public:
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
+	static const XLS::ElementType	type = XLS::typeMSOCR;
+
 	unsigned char red;
 	unsigned char green;
 	unsigned char blue;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/MSOSHADECOLOR.h

@@ -20,12 +20,11 @@ public:
 	MSOSHADECOLOR();
 	XLS::BiffStructurePtr clone();
 
-	
+	static const XLS::ElementType	type = XLS::typeMSOSHADECOLOR;
 	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-public:
 	OfficeArtCOLORREF color;
 	OSHARED::FixedPoint position;
 };

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtBStoreContainerFileBlock.h

@@ -42,6 +42,8 @@ public:
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
+	static const XLS::ElementType	type = XLS::typeOfficeArtBStoreContainerFileBlock;
+
 	void readCompressedData(XLS::CFRecord& record, OfficeArtMetafileHeader metafileHeader);
 
 	int bin_data_id;
@@ -54,7 +56,7 @@ public:
 	std::wstring rgbUid1;
 	std::wstring rgbUid2;
 	bool result;
-private:
+
 	const std::wstring ReadMD4Digest(XLS::CFRecord& record)
 	{
 		std::wstring result;