XlsFile2

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

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

@@ -29,11 +29,6 @@ public:
 //-----------------------------
 	ODRAW::OfficeArtDgContainer rgChildRec;
 
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_COMPLEX(rgChildRec)
-	//BO_ATTRIB_MARKUP_END
-
 };
 
 typedef boost::shared_ptr<MsoDrawing> MsoDrawingPtr;

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

@@ -16,8 +16,8 @@ public:
 	AF12Criteria();
 	~AF12Criteria();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,8 +17,8 @@ public:
 	AFDOper(bool bAutoFilter);
 	~AFDOper();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -12,8 +12,8 @@ class AFDOperRk: public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);	
 

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

@@ -17,8 +17,8 @@ public:
 	AFDOperStr(bool bAutoFilter);
 	~AFDOperStr();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -12,17 +12,6 @@ BiffStructurePtr AddinUdf::clone()
 }
 
 
-//void AddinUdf::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"udfName", udfName);
-//}
-//
-//
-//void AddinUdf::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	udfName = static_cast<std::wstring >(getStructAttribute(xml_tag, L"udfName"));
-//}
-
 
 void AddinUdf::store(CFRecord& record)
 {

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

@@ -14,8 +14,8 @@ class AddinUdf : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -12,18 +12,6 @@ XLS::BiffStructurePtr AntiMoniker::clone()
 }
 
 
-//void AntiMoniker::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"count", count);
-//}
-//
-//
-//void AntiMoniker::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//#pragma message("####################### AntiMoniker record has no BiffStructure::fromXML() implemented")
-//	Log::error(" Error!!! AntiMoniker record has no BiffStructure::fromXML() implemented.");
-//}
-
 
 void AntiMoniker::store(XLS::CFRecord& record)
 {

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

@@ -13,8 +13,8 @@ class AntiMoniker : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class Bes : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -11,20 +11,6 @@ BiffStructurePtr BookExt_Conditional11::clone()
 	return BiffStructurePtr(new BookExt_Conditional11(*this));
 }
 
-
-//void BookExt_Conditional11::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"fBuggedUserAboutSolution", fBuggedUserAboutSolution);
-//	xml_tag->setAttribute(L"fShowInkAnnotation", fShowInkAnnotation);
-//}
-//
-//void BookExt_Conditional11::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	fBuggedUserAboutSolution = getStructAttribute(xml_tag, L"fBuggedUserAboutSolution");
-//	fShowInkAnnotation = getStructAttribute(xml_tag, L"fShowInkAnnotation");
-//}
-
-
 void BookExt_Conditional11::store(CFRecord& record)
 {
 	unsigned char flags = 0;

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

@@ -13,8 +13,8 @@ class BookExt_Conditional11 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class BookExt_Conditional12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class BuiltInStyle : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class CFExNonCF12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class CFMStateItem : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class CFMultistate : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class CFVO : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,14 +17,14 @@ public:
 	BiffStructurePtr clone();
 
 	//virtual void toXML(BiffStructurePtr & parent); // stubbed to avoid generating unnecessary tags
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
 	static void resend(CFStream& stream, const unsigned int data_place, const unsigned int data);
 
 private:
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag); // Stubbed to make class non-abstract
+	 // Stubbed to make class non-abstract
 
 private:
 	bool row_starts;

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

@@ -25,8 +25,8 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 
 	const std::wstring toString(const bool useShortForm = true) const;
 	void fromString(const std::wstring& str);

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

@@ -16,8 +16,8 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 
 	const std::wstring toString() const;
 	void fromString(const std::wstring& str);

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

@@ -16,8 +16,8 @@ public:
 	CompositeMoniker(XLS::CFRecord& record);
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class CondFmtStructure : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class ControlInfo : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class DXFALC : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class DXFBdr : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class DXFFntD : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -19,8 +19,8 @@ class DXFN : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class DXFN12 : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,8 +17,8 @@ public:
 	DXFN12List();
 	~DXFN12List();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class DXFNum : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class DXFPat : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class DXFProt : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class ExtRst : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class Feat11FdaAutoFilter : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class Feat11FieldDataItem : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class FileOffset : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class FormatRun : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -21,8 +21,8 @@ public:
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 private:
 	CFRecordType::TypeId rt;
 	FrtFlags grbitFrt;

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

@@ -18,8 +18,8 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class FrtRefHeader : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ class FrtRefHeaderU : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class HorzBrk : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class ISSTInf : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ public:
 	ItemMoniker(XLS::CFRecord& record);
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -16,8 +16,8 @@ public:
 	List12BlockLevel();
 	~List12BlockLevel();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ public:
 	List12DisplayName();
 	~List12DisplayName();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -16,8 +16,8 @@ public:
 	List12TableStyleClientInfo();
 	~List12TableStyleClientInfo();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ public:
 	LongRGBA(const bool alpha_present);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class MDXStrIndex : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -18,14 +18,6 @@ class IMsoArray : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone(){return XLS::BiffStructurePtr(new IMsoArray(*this));}
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-	//{
-	//	for (std::vector<Type>::iterator it = data.begin(), itEnd = data.end(); it != itEnd; ++it)
-	//	{
-	//		it->toXML(xml_tag);
-	//	}
-	//}
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag) {}
 	virtual void load(XLS::CFRecord& record)
 	{
 		unsigned short nElems, nElemsAlloc;

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

@@ -11,24 +11,6 @@ XLS::BiffStructurePtr MSOCR::clone()
 	return XLS::BiffStructurePtr(new MSOCR(*this));
 }
 
-//
-//void MSOCR::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"red", red);
-//	xml_tag->setAttribute(L"green", green);
-//	xml_tag->setAttribute(L"blue", blue);
-//	xml_tag->setAttribute(L"fSchemeIndex", fSchemeIndex);
-//}
-//
-//void MSOCR::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	red = getStructAttribute(xml_tag, L"red");
-//	green = getStructAttribute(xml_tag, L"green");
-//	blue = getStructAttribute(xml_tag, L"blue");
-//	fSchemeIndex = getStructAttribute(xml_tag, L"fSchemeIndex");
-//}
-
-
 void MSOCR::store(XLS::CFRecord& record)
 {
 	unsigned char flags = 0;

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

@@ -16,12 +16,9 @@ class MSOCR : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 
-public:
 	unsigned char red;
 	unsigned char green;
 	unsigned char blue;

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

@@ -20,8 +20,8 @@ public:
 	MSOSHADECOLOR();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtBStoreContainer.cpp

@@ -18,17 +18,6 @@ XLS::BiffStructurePtr OfficeArtBStoreContainer::clone()
 	return XLS::BiffStructurePtr(new OfficeArtBStoreContainer(*this));
 }
 
-//
-//void OfficeArtBStoreContainer::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	std::for_each(rgfb.begin(), rgfb.end(), boost::bind(&OfficeArtBStoreContainerFileBlock::toXML, _1, xml_tag));
-//}
-//
-//
-//void OfficeArtBStoreContainer::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{	
-//}
-
 
 void OfficeArtBStoreContainer::storeFields(XLS::CFRecord& record)
 {	

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

@@ -27,8 +27,8 @@ public:
 		}
 	}
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -39,8 +39,8 @@ public:
 		}
 	}
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -46,25 +46,7 @@ public:
 		return XLS::BiffStructurePtr(new OfficeArtBlipCommon<pict_info, recType>(*this));
 	}
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-	//{
-	//	xml_tag->setAttribute(L"rgbUid", rgbUid.c_str());
-	//	switch(pict_info)
-	//	{
-	//		case bpi_HasMetaData:
-	//			metafileHeader.toXML(xml_tag);
-	//			break;
-
-	//		case bpi_HasInternalTag:
-	//			xml_tag->setAttribute(L"tag", tag);
-	//			break;
-	//	}
-
-	//}
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-	//{
-	//	// We don't support xlsx to xls conversion
-	//}
+
 
 	virtual void loadFields(XLS::CFRecord& record)
 	{

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

@@ -18,13 +18,9 @@ public:
 	OfficeArtCOLORREF(const long raw_data);
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-private:
 	virtual void load(XLS::CFRecord& record) {};
 	virtual void store(XLS::CFRecord& record) {};
 
-public:
 	unsigned char red;
 	unsigned char green;
 	unsigned char blue;

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

@@ -18,8 +18,8 @@ public:
 	OfficeArtClientAnchorChart();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorHF.cpp

@@ -17,21 +17,6 @@ XLS::BiffStructurePtr OfficeArtClientAnchorHF::clone()
 	return XLS::BiffStructurePtr(new OfficeArtClientAnchorHF(*this));
 }
 
-//
-//void OfficeArtClientAnchorHF::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"width", width);
-//	xml_tag->setAttribute(L"height", height);
-//}
-//
-//
-//void OfficeArtClientAnchorHF::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	width = getStructAttribute(xml_tag, L"width");
-//	height = getStructAttribute(xml_tag, L"height");
-//}
-//
-
 void OfficeArtClientAnchorHF::storeFields(XLS::CFRecord& record)
 {
 	record << width << height;

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

@@ -18,8 +18,8 @@ public:
 	OfficeArtClientAnchorHF();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtClientAnchorSheet();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtColorMRUContainer();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -17,8 +17,8 @@ class OfficeArtContainer : public OfficeArtRecord
 public:
 	OfficeArtContainer(const unsigned char recVer, const unsigned short recType, const OfficeArtClientAnchorType anchor_type);
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	// overridden:
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);

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

@@ -18,8 +18,6 @@ public:
 	OfficeArtFDG();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtFDGGBlock();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPT.cpp

@@ -17,19 +17,6 @@ XLS::BiffStructurePtr OfficeArtFOPT::clone()
 	return XLS::BiffStructurePtr(new OfficeArtFOPT(*this));
 }
 
-//
-//void OfficeArtFOPT::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	fopt.toXML(xml_tag);
-//}
-//
-//
-//void OfficeArtFOPT::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	fopt.fromXML(xml_tag);
-//}
-
-
 void OfficeArtFOPT::storeFields(XLS::CFRecord& record)
 {
 	record << fopt;

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtFOPT();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -24,8 +24,8 @@ class OfficeArtFOPTE : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void store(XLS::CFRecord& record);
 
 protected:
@@ -211,7 +211,7 @@ class fillBlip : public OfficeArtFOPTE
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(fillBlip)
 public:
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void ReadComplexData(XLS::CFRecord& record);
 
 private:

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

@@ -16,8 +16,8 @@ class OfficeArtFRIT : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtFRITContainer();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -19,15 +19,12 @@ public:
 	OfficeArtFSP();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 
 	// overriden
 	const unsigned short GetInstanceToStore();
 
-private:
 	unsigned short shape_id;
 
 	unsigned int spid;

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

@@ -18,8 +18,8 @@ public:
 	OfficeArtFSPGR();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtIDCL.cpp

@@ -11,20 +11,6 @@ XLS::BiffStructurePtr OfficeArtIDCL::clone()
 	return XLS::BiffStructurePtr(new OfficeArtIDCL(*this));
 }
 
-//
-//void OfficeArtIDCL::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	xml_tag->setAttribute(L"dgid", dgid);
-//	xml_tag->setAttribute(L"cspidCur", cspidCur);
-//}
-//
-//void OfficeArtIDCL::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	dgid = getStructAttribute(xml_tag, L"dgid");
-//	cspidCur = getStructAttribute(xml_tag, L"cspidCur");
-//}
-
-
 void OfficeArtIDCL::store(XLS::CFRecord& record)
 {
 	record << dgid << cspidCur;

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

@@ -16,8 +16,8 @@ class OfficeArtIDCL : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -18,8 +18,8 @@ class OfficeArtMetafileHeader : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void store(XLS::CFRecord& record);
 	virtual void load(XLS::CFRecord& record);
 

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

@@ -17,8 +17,8 @@ class OfficeArtRGFOPTE : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -17,8 +17,8 @@ class OfficeArtRecordHeader : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtSplitMenuColorContainer.cpp

@@ -16,24 +16,6 @@ XLS::BiffStructurePtr OfficeArtColorMRUContainer::clone()
 {
 	return XLS::BiffStructurePtr(new OfficeArtColorMRUContainer(*this));
 }
-//
-//
-//void OfficeArtColorMRUContainer::setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	std::for_each(rgmsocr.begin(), rgmsocr.end(), boost::bind(&MSOCR::toXML, _1, xml_tag));
-//}
-//
-//
-//void OfficeArtColorMRUContainer::getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag)
-//{
-//	MSOCR color;
-//	size_t number = 0;
-//	while(color.fromXML(xml_tag, ++number, false))
-//	{
-//		rgmsocr.push_back(color);
-//	}
-//}
-
 
 void OfficeArtColorMRUContainer::storeFields(XLS::CFRecord& record)
 {

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtSplitMenuColorContainer();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 	OfficeArtTertiaryFOPT();
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(XLS::CFRecord& record);
 	virtual void storeFields(XLS::CFRecord& record);
 

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

@@ -38,8 +38,6 @@ class OfficeArtClientData : public OfficeArtRecord
 public:
 	OfficeArtClientData() : OfficeArtRecord(0, ClientData) {}
 	XLS::BiffStructurePtr clone() { return XLS::BiffStructurePtr(new OfficeArtClientData(*this)); }
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag) {}
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag) {}
 	virtual void loadFields(XLS::CFRecord& record) {}
 	virtual void storeFields(XLS::CFRecord& record) {}
 
@@ -51,8 +49,6 @@ class OfficeArtClientTextbox : public OfficeArtRecord
 public:
 	OfficeArtClientTextbox() : OfficeArtRecord(0, ClientTextbox) {}
 	XLS::BiffStructurePtr clone() { return XLS::BiffStructurePtr(new OfficeArtClientTextbox(*this)); }
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag) {}
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag) {}
 	virtual void loadFields(XLS::CFRecord& record) {}
 	virtual void storeFields(XLS::CFRecord& record) {}
 

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

@@ -13,8 +13,8 @@ class PhRuns : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class Phs : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ class PropertyBagStore : public XLS::BiffStructure
 public:
 	XLS::BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(XLS::CFRecord& record);
 	virtual void store(XLS::CFRecord& record);
 

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

@@ -17,7 +17,7 @@ public:
 	PtgArea3d(const unsigned short ixti, const std::wstring& word, const PtgDataType data_type, const CellRef& cell_base_ref_init);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgBool(const std::wstring& word);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgElfCol: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgElfColV: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,7 +14,7 @@ class PtgElfLel: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgElfRadical: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,7 +14,7 @@ class PtgElfRadicalLel: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgElfRw: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgElfRwV: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgErr(const std::wstring  str);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ public:
 	PtgExp();
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -17,7 +17,7 @@ public:
 	PtgExtraArray(const std::wstring& word);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -16,7 +16,7 @@ public:
 	PtgExtraElf(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -16,7 +16,7 @@ public:
 	PtgExtraMem(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -18,7 +18,7 @@ public:
 
 	static PtgPtr create(const std::wstring& word, const unsigned char data_type);
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -19,7 +19,7 @@ public:
 
 	static PtgPtr create(const std::wstring& word, const unsigned char data_type);
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -15,7 +15,7 @@ public:
 	PtgInt(const std::wstring& word);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgMemArea : public Ptg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgMemAreaN : public Ptg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,7 +14,7 @@ class PtgMemErr : public Ptg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgMemFunc : public Ptg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgMemNoMem : public Ptg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgName(const unsigned int index, const PtgDataType data_type_init);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -15,7 +15,7 @@ public:
 	PtgNum(const std::wstring& word);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgRef(const std::wstring& word, const PtgDataType data_type);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -18,7 +18,7 @@ public:
 
 	void fromString(const std::wstring& str);
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgRefErr3d(const unsigned short ixti, const PtgDataType data_type);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -15,7 +15,7 @@ public:
 	PtgRefN(const std::wstring& word, const PtgDataType data_type, const CellRef& cell_base_ref);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -16,7 +16,7 @@ public:
 	PtgStr(const std::wstring & str);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -13,7 +13,7 @@ class PtgSxName: public OperandPtg
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ public:
 	PtgTbl();
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void loadFields(CFRecord& record);
 	virtual void storeFields(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class RPHSSub : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,7 +17,7 @@ public:
 	RevExtern(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -18,7 +18,7 @@ public:
 	RevName(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -16,7 +16,7 @@ public:
 	RevNameTabid(CFRecord& record);
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	virtual void load(CFRecord& record); // No type info
 	virtual void store(CFRecord& record); // No type info
 

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

@@ -14,8 +14,8 @@ class RgbExtra : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	void load(CFRecord& record, const PtgVector& records_from_rgce, bool is_part_of_a_revision);
 	void load(CFRecord& record, unsigned short rgce_record_type, bool is_part_of_a_revision);
 	virtual void store(CFRecord& record);

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

@@ -18,7 +18,7 @@ public:
 	// The following non-standard overriding is intended not to let empty <Rgce/> to be generated
 	//virtual void toXML(BiffStructurePtr & parent);
 
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
 	void load(CFRecord& record, const size_t cce_val);
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
@@ -30,10 +30,8 @@ public:
 	void addPtg(const PtgPtr ptg);
 	const CellRef& getLocation() const;
 
-private:
 	const CellRef cell_base_ref;
 
-private:
 	_CP_OPT(size_t) cce; // Size of rgce variable. Setting explicit is mandatory
 	PtgVector sequence;
 };

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

@@ -16,8 +16,8 @@ public:
 	Run();
 	~Run();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class SheetId : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class SqRef : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class SqRefU : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class Stxp : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,8 +17,8 @@ public:
 	TableFeatureType();
 	~TableFeatureType();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -15,8 +15,8 @@ public:
 	TxOLastRun();
 	~TxOLastRun();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -17,8 +17,8 @@ public:
 	TxORuns();
 	~TxORuns();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -14,8 +14,8 @@ class VertBrk : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -19,8 +19,8 @@ public:
 
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

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

@@ -13,8 +13,8 @@ class XTI : public BiffStructure
 public:
 	BiffStructurePtr clone();
 
-	//virtual void setXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
-	//virtual void getXMLAttributes(MSXML2::IXMLDOMElementPtr xml_tag);
+	
+	
 	virtual void load(CFRecord& record);
 	virtual void store(CFRecord& record);
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/OBJECTS.cpp

@@ -66,13 +66,11 @@ public:
 		{
 			return false;
 		}
+
 		proc.repeated(Parenthesis_OBJECTS_2(), 0, 0);
 		return true;
 	}
 
-
-
-private:
 	MsoDrawingPtr mso_drawing_;
 };
 
@@ -93,11 +91,26 @@ const bool OBJECTS::loadContent(BinProcessor& proc)
 // OBJECTS = *(MSODRAWING *(TEXTOBJECT / OBJ / CHART)) [MsoDrawingSelection]
 const bool OBJECTS::loadContentRead(BinReaderProcessor& proc)
 {
-	MsoDrawingPtr mso_drawing(new MsoDrawing(is_inside_chart_sheet_));
-	bool res1 = proc.repeated(Parenthesis_OBJECTS_1(mso_drawing), 0, 0);
-	bool res2 = proc.optional(MsoDrawingSelection());
+	m_MsoDrawing = boost::shared_ptr<MsoDrawing>(new MsoDrawing(is_inside_chart_sheet_));
+	
+	int count1 = proc.repeated(Parenthesis_OBJECTS_1(m_MsoDrawing), 0, 0);
+
+	for(std::list<BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end() ; it++)
+	{
+		XLS::ElementType type = (*it)->get_type();
+
+		switch (type)
+		{
+		case XLS::typeOBJ:			m_OBJs.push_back(*it);				break;
+		case XLS::typeTEXTOBJECT:	m_TEXTOBJECTs.push_back(*it);		break;
+		case XLS::typeCHART:		m_CHARTs.push_back(*it);			break;
+		}
+	}
+	elements_.clear();
+
+	int count2  = proc.optional(MsoDrawingSelection());
 
-	return res1 || res2;
+	return count1 > 0 || count2 > 0;
 }
 
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/OBJECTS.h

@@ -5,6 +5,8 @@
 namespace XLS
 {;
 
+class  MsoDrawing;
+typedef boost::shared_ptr<MsoDrawing> MsoDrawingPtr;
 
 // Logical representation of OBJECTS union of records 
 class OBJECTS: public CompositeObject
@@ -23,6 +25,12 @@ public:
 	static const ElementType	type = typeOBJECTS;
 
 	bool is_inside_chart_sheet_;
+
+	MsoDrawingPtr				m_MsoDrawing;
+	
+	std::vector<BaseObjectPtr>	m_OBJs;
+	std::vector<BaseObjectPtr>	m_TEXTOBJECTs;
+	std::vector<BaseObjectPtr>	m_CHARTs;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PAGESETUP.cpp

@@ -118,9 +118,9 @@ int PAGESETUP::serialize(std::wostream & stream)
 					headerFooter = true;
 				}
 			}
+			bool b = false, t = false, l = false, r = false ;
 			for (std::list<XLS::BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); it++)
 			{
-				bool b = false, t = false; //double set???
 				switch((*it)->get_type())
 				{
 				case typeTopMargin:
@@ -141,19 +141,27 @@ int PAGESETUP::serialize(std::wostream & stream)
 					{
 						LeftMargin* left = dynamic_cast<LeftMargin*>(it->get());
 						CP_XML_ATTR(L"left", left->num);
+						l= true;
 					}break;				
 				case typeRightMargin:
 					{
 						RightMargin* right = dynamic_cast<RightMargin*>(it->get());
 						CP_XML_ATTR(L"right", right->num);
+						r= true;
 					}break;		
 				}
 			}
+			if (headerFooter)
+			{
+				if (!t)CP_XML_ATTR(L"top", 1);
+				if (!b)CP_XML_ATTR(L"bottom", 1);
+				if (!l)CP_XML_ATTR(L"left", 0.75);
+				if (!r)CP_XML_ATTR(L"right", 0.75);
+			}
 		}
 
 		if (headerFooter)
-		{
-		
+		{		
 			//CP_XML_NODE(L"headerFooter"){}
 		}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.cpp

@@ -142,7 +142,11 @@ const bool WorksheetSubstream::loadContent(BinProcessor& proc)
 		}
 	}
 
-	proc.optional(OBJECTS(false));  // Let it be optional
+	if (proc.optional(OBJECTS(false)))
+	{
+		m_OBJECTS = elements_.back();
+		elements_.pop_back();
+	}
 	
 	proc.repeated<HFPicture>(0, 0);
 	proc.repeated<Note>(0, 0);

ASCOfficeXlsFile2/source/XlsFormat/Logic/WorksheetSubstream.h

@@ -33,6 +33,7 @@ public:
 	BaseObjectPtr				m_CELLTABLE;
 	BaseObjectPtr				m_SHFMLA_SET;
 	BaseObjectPtr				m_Dimensions;
+	BaseObjectPtr				m_OBJECTS;
 	std::vector<BaseObjectPtr>	m_HLINK;
 };
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp

@@ -17,7 +17,7 @@
 #include "../XlsFormat/Logic/Biff_unions/SHAREDSTRINGS.h"
 #include "../XlsFormat/Logic/Biff_unions/HLINK.h"
 #include "../XlsFormat/Logic/Biff_unions/LBL.h"
-
+#include "../XlsFormat/Logic/Biff_unions/OBJECTS.h"
 
 #include <Logic/Biff_records/HLink.h>
 #include <Logic/Biff_structures/URLMoniker.h>
@@ -165,6 +165,11 @@ void XlsConverter::convert(XLS::BaseObject	*xls_unknown)
 			XLS::LBL * lbl = dynamic_cast<XLS::LBL *>(xls_unknown);
 			convert(lbl);
 		}break;
+	case XLS::typeOBJECTS:
+		{
+			XLS::OBJECTS * obj = dynamic_cast<XLS::OBJECTS *>(xls_unknown);
+			convert(obj);
+		}break;
 	case XLS::typeAnyObject:	
 	default:
 		{
@@ -240,6 +245,7 @@ void XlsConverter::convert(XLS::WorksheetSubstream* sheet)
 	{
 		convert(sheet->m_HLINK[i].get());
 	}
+	convert((XLS::OBJECTS*)sheet->m_OBJECTS.get());
 
 	if (sheet->m_PAGESETUP)
 	{
@@ -250,6 +256,7 @@ void XlsConverter::convert(XLS::WorksheetSubstream* sheet)
 void XlsConverter::convert(XLS::GlobalsSubstream* global)
 {
 	if (global == NULL) return;
+	
 	convert((XLS::FORMATTING*)global->m_Formating.get());
 	
 	convert((XLS::THEME*)global->m_Theme.get());
@@ -258,8 +265,11 @@ void XlsConverter::convert(XLS::GlobalsSubstream* global)
 
 	for (long i = 0 ; i < global->m_LBL.size(); i++)
 	{
-		convert(global->m_LBL[i].get());
+		convert((XLS::LBL*)global->m_LBL[i].get());
 	}
+
+	for (long i = 0 ; i < global->m_MSODRAWINGGROUP.size(); i++)
+		convert((XLS::MSODRAWINGGROUP*)global->m_MSODRAWINGGROUP[i].get());
 }
 
 typedef boost::unordered_map<XLS::FillInfo, int>	mapFillInfo;
@@ -339,6 +349,10 @@ std::wstring XlsConverter::GetTargetMoniker(XLS::BiffStructure *moniker)
 	return L"";
 }
 
+void XlsConverter::convert(XLS::MSODRAWINGGROUP * mso_drawing)
+{
+	
+}
 void XlsConverter::convert(XLS::HLINK * HLINK_)
 {
 	XLS::HLink * hLink = dynamic_cast<XLS::HLink*>(HLINK_->m_HLink.get());
@@ -364,6 +378,27 @@ void XlsConverter::convert(XLS::THEME* theme)
 	if (theme == NULL) return;
 }
 
+void XlsConverter::convert(XLS::OBJECTS* objects)
+{
+	if (objects == NULL) return;
+
+	for (long i = 0 ; i < objects->m_OBJs.size(); i++)
+	{
+		xlsx_context->get_drawing_context().start_drawing(L"", 1);
+
+
+		xlsx_context->get_drawing_context().end_drawing();
+	}
+
+	for (long i = 0 ; i < objects->m_CHARTs.size(); i++)
+	{
+		//xlsx_context->get_chart_context().start_drawing();
+
+
+		//xlsx_context->get_chart_context().end_drawing();
+	}
+}
+
 void XlsConverter::convert(XLS::SHAREDSTRINGS* sharedstrings)
 {
 	if (sharedstrings == NULL) return;

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.h

@@ -33,6 +33,8 @@ namespace XLS
 	class SHAREDSTRINGS;
 	class HLINK;
 	class LBL;
+	class OBJECTS;
+	class MSODRAWINGGROUP;
 	
 }
 
@@ -66,8 +68,9 @@ private:
 	void convert(XLS::SHAREDSTRINGS				* sharedstrings);
 	void convert(XLS::HLINK						* hlink);
 	void convert(XLS::LBL						* def_name);
+	void convert(XLS::OBJECTS					* objects);
+	void convert(XLS::MSODRAWINGGROUP			* mso_drawing);
 
-	
 	std::wstring GetTargetMoniker(XLS::BiffStructure *moniker);
 
 };

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.cpp

@@ -14,11 +14,8 @@ namespace oox {
     
 
 xlsx_conversion_context::xlsx_conversion_context( package::xlsx_document * outputDocument): output_document_(outputDocument),
-	xlsx_table_context_(*this, xlsx_text_context_)
-	//
-	//maxDigitSize_ (std::pair<float,float>(-1.0, -1.0) ),
-	//default_style_( (std::numeric_limits<size_t>::max)() ),
-	//xlsx_drawing_context_handle_(mediaitems_)
+	xlsx_table_context_(*this/*, xlsx_text_context_*/), 
+	xlsx_drawing_context_handle_(get_mediaitems())
 {
 }
 
@@ -35,6 +32,10 @@ xlsx_conversion_context::~xlsx_conversion_context()
 //{
 //	current_stream_ = stream;
 //}
+xlsx_drawing_context & xlsx_conversion_context::get_drawing_context()
+{
+    return get_table_context().get_drawing_context();
+}
 
 void xlsx_conversion_context::start_document()
 {
@@ -67,6 +68,11 @@ void xlsx_conversion_context::end_table()
     get_table_context().end_table();
 }
 
+xlsx_drawing_context_handle & xlsx_conversion_context::get_drawing_context_handle()
+{
+    return xlsx_drawing_context_handle_;
+}
+
 void xlsx_conversion_context::end_document()
 {
 	std::wstringstream workbook_content;
@@ -173,8 +179,8 @@ void xlsx_conversion_context::end_document()
 		output_document_->content_type().set_media(get_mediaitems());
         output_document_->get_xl_files().set_media(get_mediaitems());
 
-        //package::xl_drawings_ptr drawings = package::xl_drawings::create(xlsx_drawing_context_handle_.content());
-        //output_document_->get_xl_files().set_drawings(drawings);
+        package::xl_drawings_ptr drawings = package::xl_drawings::create(xlsx_drawing_context_handle_.content());
+        output_document_->get_xl_files().set_drawings(drawings);
 	
         //package::xl_comments_ptr comments = package::xl_comments::create(xlsx_comments_context_handle_.content());
         //output_document_->get_xl_files().set_comments(comments);

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_conversion_context.h

@@ -5,6 +5,7 @@
 
 #include "xlsx_textcontext.h"
 #include "xlsx_tablecontext.h"
+#include "xlsx_drawing_context.h"
 
 #include "xlsx_output_xml.h"
 
@@ -30,41 +31,6 @@ public:
 	bool start_table(const std::wstring & name);
     void end_table();
 
-
- //   void start_table_column(unsigned int repeated, const std::wstring & defaultCellStyleName, int & cMin, int & cMax);
- //   void table_column_last_width(double w);
- //   double table_column_last_width() const;
- //   void end_table_column();
-
-	//void set_table_row_group(int count, bool collapsed, int level);
- //   void start_table_row(const std::wstring & styleName, const std::wstring & defaultCellStyleName);
- //   void non_empty_row();
- //   void end_table_row();
- //   bool is_empty_row() const;
- //   void set_current_row_height(size_t height_pt);    
-
- //   void start_table_cell(const std::wstring & formula, size_t columnsSpanned, size_t rowsSpanned);
- //   void end_table_cell();
- //   
- //   void set_current_cell_style_id(unsigned int xfId);
- //   int get_current_cell_style_id();
-
- //   void start_table_covered_cell();
- //   void end_table_covered_cell();
-
- //   int current_table_column() const;
- //   int current_table_row() const;
-
- //   void start_hyperlink(const std::wstring & styleName);
- //   void end_hyperlink(std::wstring const & href);
-
- //   std::wstring current_cell_address() const;
-
-
-    //std::pair<float,float> getMaxDigitSize();
-
- //   void process_styles();
-
  	std::wostream				& shared_strings()			{ return xlsx_shared_strings_; }    
  	std::wostream				& defined_names()			{ return xlsx_defined_names_; }    
 	
@@ -72,27 +38,23 @@ public:
     xlsx_table_context          & get_table_context()		{ return xlsx_table_context_; }
     xlsx_xml_worksheet          & current_sheet();
  
-	//   const xlsx_table_context    & get_table_context() const { return xlsx_table_context_; }
- //   xlsx_style_manager          & get_style_manager()		{ return xlsx_style_; }
- //  
- //   oox_chart_context           & current_chart();
- //   num_format_context          & get_num_format_context()		 { return num_format_context_; }
- //   size_t                        get_default_cell_style() const { return default_style_; }
- //   xlsx_table_metrics          & get_table_metrics();
- //   xlsx_drawing_context        & get_drawing_context();
- //   xlsx_drawing_context_handle & get_drawing_context_handle();	
- //   xlsx_comments_context       & get_comments_context();
-	//xlsx_comments_context_handle & get_comments_context_handle();
-
-    mediaitems & get_mediaitems() { return mediaitems_; }
+//   const xlsx_table_context    & get_table_context() const { return xlsx_table_context_; }
+//   oox_chart_context           & current_chart();
+
+	xlsx_drawing_context        & get_drawing_context();
+	xlsx_drawing_context_handle & get_drawing_context_handle();	
+ //	xlsx_comments_context       & get_comments_context();
+//	xlsx_comments_context_handle & get_comments_context_handle();
 
+	mediaitems & get_mediaitems() { return mediaitems_; }
 private:
 
     void create_new_sheet(std::wstring const & name);
 
     package::xlsx_document				*output_document_;
 
-    //CApplicationFonts					*applicationFonts_;
+	mediaitems							mediaitems_;
+   //CApplicationFonts					*applicationFonts_;
 
     std::vector<xlsx_xml_worksheet_ptr> sheets_;
     //std::vector<oox_chart_context_ptr>  charts_;
@@ -101,7 +63,6 @@ private:
     //std::pair<float,float>              maxDigitSize_;
     //num_format_context                  num_format_context_;
     //size_t                              default_style_;
-    mediaitems                          mediaitems_;
   
     xlsx_table_context              xlsx_table_context_;
     xlsx_text_context               xlsx_text_context_;
@@ -109,7 +70,7 @@ private:
 	std::wstringstream				xlsx_shared_strings_;
 	std::wstringstream				xlsx_defined_names_;
 
-    //xlsx_drawing_context_handle     xlsx_drawing_context_handle_;
+    xlsx_drawing_context_handle     xlsx_drawing_context_handle_;
     //xlsx_comments_context_handle    xlsx_comments_context_handle_;
     
 };

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

+
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
+
+//#include <cpdoccore/xml/utils.h>
+//
+//#include "mediaitems_utils.h"
+//
+//#include "xlsx_utils.h"
+#include "xlsx_drawing_context.h"
+
+
+
+namespace oox {
+
+
+class xlsx_drawing_context_handle::Impl
+{
+public:
+    Impl(mediaitems & items)
+        : items_(items), next_rId_(1), next_drawing_id_(1) 
+    {
+    }  
+
+    mediaitems & get_mediaitems() { return items_; }
+
+    size_t next_rId()
+    {
+        return next_rId_++;
+    }
+
+    std::pair<std::wstring, std::wstring> add_drawing_xml(std::wstring const & content, xlsx_drawings_ptr drawings)
+    {
+        const std::wstring id = boost::lexical_cast<std::wstring>(next_drawing_id_++);
+        const std::wstring fileName = std::wstring(L"drawing") + id + L".xml";
+       
+		drawings_.push_back(drawing_elm(fileName, content, drawings));
+       
+		const std::wstring rId = std::wstring(L"rId") + id;//rDrId
+        return std::pair<std::wstring, std::wstring>(fileName, rId);
+    }
+    const std::vector<drawing_elm> & content() const
+    {
+        return drawings_;
+    }
+
+	xlsx_drawings_ptr get_drawings();
+private:
+    mediaitems & items_;
+    size_t next_rId_;
+    
+    std::vector<drawing_elm> drawings_;
+
+    size_t next_drawing_id_;
+};
+
+xlsx_drawing_context_handle::xlsx_drawing_context_handle(mediaitems & items)
+: impl_(new xlsx_drawing_context_handle::Impl(items))
+{
+}
+
+xlsx_drawing_context_handle::~xlsx_drawing_context_handle()
+{
+}
+std::pair<std::wstring, std::wstring> xlsx_drawing_context_handle::add_drawing_xml(std::wstring const & content, xlsx_drawings_ptr drawings )
+{
+    return impl_->add_drawing_xml(content, drawings);
+}
+
+const std::vector<drawing_elm> & xlsx_drawing_context_handle::content() const
+{
+    return impl_->content();
+}
+
+//---------------------------------------------------------------------------------------
+
+xlsx_drawing_context::xlsx_drawing_context(xlsx_drawing_context_handle & h)
+ : handle_(h), xlsx_drawings_(xlsx_drawings::create()), count_object(0)
+{    
+}
+
+void xlsx_drawing_context::start_drawing(std::wstring const & name, int type)
+{
+	count_object++;
+}
+
+void xlsx_drawing_context::end_drawing()
+{
+	bool isMediaInternal = true;
+	//std::wstring ref = L"A8";
+
+	//std::wstring rId = handle_.impl_->get_mediaitems().add_or_find(L"", mediaitems::typeImage, isMediaInternal, ref);
+
+	//xlsx_drawings_->add(stream_.str(), isMediaInternal, rId , ref, mediaitems::typeImage);
+	stream_.clear();
+
+}
+
+bool xlsx_drawing_context::empty()
+{
+	return xlsx_drawings_->empty();
+}
+
+xlsx_drawings_ptr xlsx_drawing_context::get_drawings()
+{
+    return xlsx_drawings_;
+}
+
+}
+

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.h

+#pragma once
+
+#include <vector>
+
+#include "xlsx_drawings.h"
+	
+namespace oox {
+
+class mediaitems;
+
+class xlsx_drawing_context_handle
+{
+public:
+    xlsx_drawing_context_handle(mediaitems & items);
+    ~xlsx_drawing_context_handle();
+    
+    std::pair<std::wstring, std::wstring> add_drawing_xml(std::wstring const & content, xlsx_drawings_ptr drawings);
+    const std::vector<drawing_elm> & content() const;
+
+    friend class xlsx_drawing_context;
+private:
+    class Impl;
+    _CP_PTR(Impl) impl_;
+};
+
+
+class xlsx_drawing_context
+{
+public:
+    xlsx_drawing_context(xlsx_drawing_context_handle & h);
+	~xlsx_drawing_context(){}
+
+	void start_drawing(std::wstring const & name, int type);	
+
+	void end_drawing();
+
+	std::wostream & drawing_stream() {return stream_;}
+    
+	xlsx_drawings_ptr get_drawings();
+
+	bool empty();
+
+private:
+	std::wstringstream				stream_;
+	xlsx_drawing_context_handle	  & handle_;
+	xlsx_drawings_ptr				xlsx_drawings_;
+	int								count_object;
+};
+
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.cpp

+
+#include "xlsx_drawings.h"
+
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
+#include <vector>
+
+#include <simple_xml_writer.h>
+
+#include "mediaitems_utils.h"
+#include "oox_rels.h"
+
+namespace oox {
+
+class xlsx_drawings::Impl
+{
+    struct rel_
+    { 
+        rel_(bool is_internal, std::wstring const & rid, std::wstring const & ref,  mediaitems::Type type) :
+        is_internal_(is_internal),
+        rid_(rid),
+        ref_(ref),
+        type_(type)
+        {}
+
+        bool is_internal_;
+        std::wstring rid_;
+        std::wstring ref_;
+        mediaitems::Type type_;
+    };
+
+public:
+	void add(std::wstring const & d,
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+		mediaitems::Type type)
+    {
+        xlsx_drawings_.push_back(d);
+		
+		bool present = false;
+        BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
+        {		
+			if (r.rid_ == rid && r.ref_ == ref)
+				present = true;
+		}
+		if (!present)
+		{
+			xlsx_drawing_rels_.push_back(rel_(isInternal, rid, ref, type));
+		}
+  //      BOOST_FOREACH(_hlink_desc h, d.hlinks)
+  //      {
+		//	xlsx_drawing_rels_.push_back(rel_(false, h.hId, h.hRef, mediaitems::typeHyperlink));
+		//}
+    }
+    void add(
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+		mediaitems::Type type)
+    {
+		bool present = false;
+        BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
+        {		
+			if (r.rid_ == rid && r.ref_ == ref)
+				present = true;
+		}
+		if (!present)
+		{
+			xlsx_drawing_rels_.push_back(rel_(isInternal, rid, ref, type));
+		}
+    }
+
+
+	void serialize(std::wostream & strm) 
+    {
+        CP_XML_WRITER(strm)
+        {
+            CP_XML_NODE(L"xdr:wsDr")
+            {
+                CP_XML_ATTR(L"xmlns:xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
+                CP_XML_ATTR(L"xmlns:a"	, L"http://schemas.openxmlformats.org/drawingml/2006/main");
+                CP_XML_ATTR(L"xmlns:r"	, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+
+				BOOST_FOREACH(std::wstring & d, xlsx_drawings_)
+                {
+                    CP_XML_STREAM() << d;
+                }
+			}
+        }
+    }
+    
+    bool empty() const
+    {
+        return (xlsx_drawings_.empty());
+    }
+
+    void dump_rels(rels & Rels)
+    {
+        BOOST_FOREACH(rel_ const & r, xlsx_drawing_rels_)
+        {
+			if (r.type_ == mediaitems::typeChart)// -      
+			{
+				Rels.add(relationship(
+							r.rid_,
+							utils::media::get_rel_type(r.type_),
+							(r.is_internal_ ? std::wstring(L"../") + r.ref_ : r.ref_),
+							(r.is_internal_ ? L"" : L"External")
+							) 
+					);
+			}
+			else if (r.type_ == mediaitems::typeImage)
+			{
+				Rels.add(relationship(
+							r.rid_,
+							utils::media::get_rel_type(r.type_),
+							r.is_internal_ ? std::wstring(L"../") + r.ref_ : r.ref_,
+							(r.is_internal_ ? L"" : L"External")
+							) 
+					);
+			}
+			//typeShape    -  
+ 			else if (r.type_ == mediaitems::typeHyperlink)//    ...  ...  ..  
+			{
+				Rels.add(relationship(
+							r.rid_,
+							L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
+							r.ref_,
+							L"External")
+				);
+			}
+		}
+    }
+
+private:
+
+	std::vector<std::wstring>	xlsx_drawings_;	
+	std::vector<rel_>			xlsx_drawing_rels_;
+};
+
+xlsx_drawings::xlsx_drawings() : impl_( new xlsx_drawings::Impl() )
+{
+}
+
+xlsx_drawings::~xlsx_drawings()
+{
+}
+
+void xlsx_drawings::add(std::wstring const & d,
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+        mediaitems::Type type)
+{
+    impl_->add(d, isInternal, rid, ref, type);
+}
+void xlsx_drawings::add(
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+        mediaitems::Type type)
+{
+    impl_->add(isInternal, rid, ref, type);
+}
+void xlsx_drawings::serialize(std::wostream & _Wostream)
+{
+    impl_->serialize(_Wostream);
+}
+
+bool xlsx_drawings::empty() const
+{
+    return impl_->empty();
+}
+
+void xlsx_drawings::dump_rels(rels & Rels)
+{
+    return impl_->dump_rels(Rels);
+}
+
+xlsx_drawings_ptr xlsx_drawings::create()
+{
+    return boost::make_shared<xlsx_drawings>();
+}
+
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawings.h

+#pragma once
+
+#include <sstream>
+
+#include <common.h>
+#include "mediaitems.h"
+
+namespace oox {
+
+class xlsx_drawings;
+typedef _CP_PTR(xlsx_drawings) xlsx_drawings_ptr;
+
+struct drawing_elm
+{
+    drawing_elm(std::wstring const & _filename, std::wstring const & _content, xlsx_drawings_ptr _drawings)
+        : filename(_filename), content(_content), drawings(_drawings)
+    {}
+    
+    std::wstring filename;
+    std::wstring content;
+    xlsx_drawings_ptr drawings;
+};
+
+class rels;
+
+class xlsx_drawings
+{
+public:
+    xlsx_drawings();
+    ~xlsx_drawings();
+    static xlsx_drawings_ptr create();
+
+public:
+	void add(std::wstring const & d,
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+		mediaitems::Type type
+        );
+    void add(
+        bool isInternal,
+        std::wstring const & rid,
+        std::wstring const & ref,
+		mediaitems::Type type
+        );
+    bool empty() const;
+
+    void dump_rels(rels & Rels);
+   
+	void serialize(std::wostream & _Wostream);  
+
+private:
+    class Impl;
+    _CP_PTR(Impl) impl_;
+    
+};
+
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_package.cpp

@@ -257,35 +257,35 @@ void xl_files::set_vml_drawings(element_ptr Element)
 //    }
 //}
 //////////////////////////
-//xl_drawings_ptr xl_drawings::create(const std::vector<drawing_elm> & elms)
-//{
-//    return boost::make_shared<xl_drawings>(boost::ref(elms));
-//}
+xl_drawings_ptr xl_drawings::create(const std::vector<drawing_elm> & elms)
+{
+    return boost::make_shared<xl_drawings>(boost::ref(elms));
+}
 
-//void xl_drawings::write(const std::wstring & RootPath)
-//{
-//	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"drawings";
-//	FileSystem::Directory::CreateDirectory(path.c_str());
-//
-//    BOOST_FOREACH(drawing_elm const & e, drawings_)
-//    {
-//        package::simple_element(e.filename, e.content).write(path);        
-//
-//        rels_files relFiles;
-//        rels_file_ptr r = rels_file::create(e.filename + L".rels");
-//        e.drawings->dump_rels(r->get_rels());
-//               
-//                
-//        relFiles.add_rel_file(r);
-//        relFiles.write(path);
-//        
-//
-//        content_type & contentTypes = this->get_main_document()->content_type().get_content_type();
-//
-//        const std::wstring kDrawingCT = L"application/vnd.openxmlformats-officedocument.drawing+xml";
-//        contentTypes.add_override(L"/xl/drawings/" + e.filename, kDrawingCT);
-//    }
-//}
+void xl_drawings::write(const std::wstring & RootPath)
+{
+	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"drawings";
+	FileSystem::Directory::CreateDirectory(path.c_str());
+
+    BOOST_FOREACH(drawing_elm const & e, drawings_)
+    {
+        package::simple_element(e.filename, e.content).write(path);        
+
+        rels_files relFiles;
+        rels_file_ptr r = rels_file::create(e.filename + L".rels");
+        e.drawings->dump_rels(r->get_rels());
+               
+                
+        relFiles.add_rel_file(r);
+        relFiles.write(path);
+        
+
+        content_type & contentTypes = this->get_main_document()->content_type().get_content_type();
+
+        const std::wstring kDrawingCT = L"application/vnd.openxmlformats-officedocument.drawing+xml";
+        contentTypes.add_override(L"/xl/drawings/" + e.filename, kDrawingCT);
+    }
+}
 
 //////////////////////////////
 //xl_comments_ptr xl_comments::create(const std::vector<comment_elm> & elms)

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_package.h

@@ -4,7 +4,7 @@
 
 #include <boost/noncopyable.hpp>
 
-//#include "xlsx_drawings.h"
+#include "xlsx_drawings.h"
 //#include "xlsx_comments.h"
 //
 //class CApplicationFonts;
@@ -91,34 +91,33 @@ public:
 //
 //};
 //
-//class xl_drawings;
-//typedef _CP_PTR(xl_drawings) xl_drawings_ptr;
+class xl_drawings;
+typedef _CP_PTR(xl_drawings) xl_drawings_ptr;
+
+class xl_drawings: public element
+{
+public:
+    virtual void write(const std::wstring & RootPath);
+    void set_rels(rels_files * rels)
+    {
+        rels_ = rels;
+    }
+
+    xl_drawings(const std::vector<drawing_elm> & elms) : drawings_ ( elms )
+    {
+    }
+
+    static xl_drawings_ptr create(const std::vector<drawing_elm> & elms);
+
+private:
+    const std::vector<drawing_elm> & drawings_;
+    rels_files * rels_;
+
+};
+class xl_vml_drawings;
+typedef _CP_PTR(xl_vml_drawings) xl_vml_drawings_ptr;
+
 
-/// \class xl_drawings
-//class xl_drawings: public element
-//{
-//public:
-//    virtual void write(const std::wstring & RootPath);
-//    void set_rels(rels_files * rels)
-//    {
-//        rels_ = rels;
-//    }
-//
-//    xl_drawings(const std::vector<drawing_elm> & elms) : drawings_ ( elms )
-//    {
-//    }
-//
-//    static xl_drawings_ptr create(const std::vector<drawing_elm> & elms);
-//
-//private:
-//    const std::vector<drawing_elm> & drawings_;
-//    rels_files * rels_;
-//
-//};
-//class xl_vml_drawings;
-//typedef _CP_PTR(xl_vml_drawings) xl_vml_drawings_ptr;
-//
-///// \class xl_drawings
 //class xl_vml_drawings: public element
 //{
 //public:

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.cpp

@@ -5,160 +5,64 @@
 //#include "logging.h"
 
 #include <boost/foreach.hpp>
-#include <iostream>
+#include <sstream>
+
+#include "simple_xml_writer.h"
 
-//#include "xlsx_table_state.h"
 
 namespace oox {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+table_state::table_state(xlsx_conversion_context & Context) : drawing_context_(Context.get_drawing_context_handle())
+{
+}
 
-//xlsx_table_state & xlsx_table_context::state()
-//{
-//    return table_state_stack_.back();
-//}
+table_state_ptr & xlsx_table_context::state()
+{
+    return tables_state_.back();
+}
 //
 //const xlsx_table_state & xlsx_table_context::state() const
 //{
 //    return table_state_stack_.back();
 //}
 
-xlsx_table_context::
-xlsx_table_context(xlsx_conversion_context & Context, xlsx_text_context & textContext): context_(Context)
-				, xlsx_text_context_(textContext)
+xlsx_table_context::xlsx_table_context(xlsx_conversion_context & Context/*, xlsx_text_context & textContext*/) : 
+										context_(Context)//, xlsx_text_context_(textContext)
 {        
 }
 
 void xlsx_table_context::start_table(const std::wstring & name)
 {
-    //table_state_stack_.push_back( xlsx_table_state(context_, tableStyleName, tableName) );
+	tables_state_.push_back( table_state_ptr(new table_state(context_)));
 }
 
 void xlsx_table_context::end_table()
 {
+	if (!get_drawing_context().empty())
+    {
+		std::wstringstream strm;
+		get_drawing_context().get_drawings()->serialize(strm);
+		
+		const std::pair<std::wstring, std::wstring> drawingName	= context_.get_drawing_context_handle().add_drawing_xml(strm.str(), get_drawing_context().get_drawings());
+
+		context_.current_sheet().set_drawing_link(drawingName.first, drawingName.second);
+
+        CP_XML_WRITER(context_.current_sheet().drawing())
+        {
+            CP_XML_NODE(L"drawing")
+            {
+                CP_XML_ATTR(L"r:id", drawingName.second);
+            }
+        }
+    }
 }
-//
-//std::wstring xlsx_table_context::get_current_table_name() const
-//{
-//    return state().get_current_table_name();
-//}
-//
-//void xlsx_table_context::start_cell(const std::wstring & formula, size_t columnsSpanned, size_t rowsSpanned)
-//{
-//    state().start_cell(columnsSpanned, rowsSpanned);    
-//}
-//
-//void xlsx_table_context::end_cell()
-//{    
-//    state().end_cell();
-//}
-//
-//void xlsx_table_context::set_current_cell_style_id(unsigned int xfId)
-//{
-//    return state().set_current_cell_style_id(xfId);
-//}
-//
-//int xlsx_table_context::get_current_cell_style_id()
-//{
-//    return state().get_current_cell_style_id();
-//}
-//
-//void xlsx_table_context::start_cell_content()
-//{
-//    xlsx_text_context_.start_cell_content();
-//}
-//
-//int xlsx_table_context::end_cell_content()
-//{
-//    return xlsx_text_context_.end_cell_content();
-//}
-//
-//void xlsx_table_context::start_covered_cell()
-//{
-//    return state().start_covered_cell();
-//}
-//
-//void xlsx_table_context::end_covered_cell()
-//{
-//    return state().end_covered_cell();
-//}
-//void xlsx_table_context::set_table_row_group(int count, bool collapsed, int level)
-//{
-//	return state().set_table_row_group(count, collapsed, level);
-//}
-//void xlsx_table_context::start_row(const std::wstring & StyleName, const std::wstring & defaultCellStyleName)
-//{
-//    return state().start_row(StyleName, defaultCellStyleName);
-//}
-//
-//void xlsx_table_context::non_empty_row()
-//{
-//    return table_state_stack_.back().non_empty_row();
-//}
-//
-//bool xlsx_table_context::is_empty_row() const
-//{
-//    return state().is_empty_row();
-//}
-//
-//void xlsx_table_context::end_row()
-//{
-//    return state().end_row();
-//}
-//
-//void xlsx_table_context::start_column(unsigned int repeated, const std::wstring & defaultCellStyleName)
-//{
-//    return state().start_column(repeated, defaultCellStyleName);
-//}
-//
-//unsigned int xlsx_table_context::columns_count()
-//{
-//    return table_state_stack_.back().columns_count();    
-//}
-//
-//std::wstring xlsx_table_context::default_row_cell_style() const
-//{
-//    return state().default_row_cell_style();
-//}
-//
-//std::wstring xlsx_table_context::default_column_cell_style() const
-//{
-//    return state().default_column_cell_style();
-//}
-//
-//int xlsx_table_context::current_column() const
-//{
-//    return state().current_column();
-//}
-//
-//int xlsx_table_context::current_row() const
-//{
-//    return state().current_row();
-//}
-//
-//void xlsx_table_context::serialize_merge_cells(std::wostream & _Wostream)
-//{
-//    return state().serialize_merge_cells(_Wostream);
-//}
-//void xlsx_table_context::serialize_table_format(std::wostream & _Wostream)
-//{
-//    return state().serialize_table_format(_Wostream);
-//}
-//void xlsx_table_context::serialize_hyperlinks(std::wostream & _Wostream)
-//{
-//    return state().serialize_hyperlinks(_Wostream);
-//}
 
 
-//xlsx_table_metrics & xlsx_table_context::get_table_metrics()
-//{
-//    return state().get_table_metrics();
-//}
-//
-//xlsx_drawing_context & xlsx_table_context::get_drawing_context()
-//{
-//    return state().get_drawing_context();
-//}
+xlsx_drawing_context & xlsx_table_context::get_drawing_context()
+{
+    return state()->drawing_context_;
+}
 //
 //xlsx_comments_context & xlsx_table_context::get_comments_context()
 //{
@@ -181,15 +85,15 @@ void xlsx_table_context::end_table()
 //
  std::wstring xlsx_table_context::add_hyperlink(std::wstring const & ref, std::wstring const & target, std::wstring const & display)
 {
-    return xlsx_hyperlinks_.add( ref, target, display);
+    return state()->hyperlinks_.add( ref, target, display);
 }
  void xlsx_table_context::dump_rels_hyperlinks(rels & Rels)
 {
-	return xlsx_hyperlinks_.dump_rels(Rels);
+	return state()->hyperlinks_.dump_rels(Rels);
 }
 void xlsx_table_context::serialize_hyperlinks(std::wostream & _Wostream)
 {
-    return xlsx_hyperlinks_.serialize(_Wostream);
+    return state()->hyperlinks_.serialize(_Wostream);
 }
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_tablecontext.h

 #pragma once
 
-#include <string>
 #include <list>
 
-//#include "xlsx_drawing_context.h"
+#include "xlsx_drawing_context.h"
 //#include "xlsx_comments_context.h"
 #include "xlsx_hyperlinks.h"
 
@@ -12,33 +11,31 @@ namespace oox {
 class xlsx_conversion_context;
 class xlsx_text_context;
 
-/// \class xlsx_table_context
+struct table_state
+{
+	table_state(xlsx_conversion_context & Context);
+
+	xlsx_hyperlinks				hyperlinks_;
+	xlsx_drawing_context		drawing_context_;
+   //xlsx_comments_context	comments_context_;
+
+};
+typedef _CP_PTR(table_state) table_state_ptr;
+
 class xlsx_table_context
 {
 public:
-    xlsx_table_context(xlsx_conversion_context & Context, xlsx_text_context & textCotnext);
+    xlsx_table_context(xlsx_conversion_context & Context/*, xlsx_text_context & textCotnext*/);
 
 public:
 	void start_table(const std::wstring & name);
     void end_table();
 
-    std::wstring get_current_table_name() const;
- //   
- //   void start_cell(const std::wstring & formula,
- //                   size_t columnsSpanned,
- //                   size_t rowsSpanned);
-
- //   void end_cell();
-
-
-
-	//xlsx_table_metrics & get_table_metrics();
- // 
-	//xlsx_drawing_context & get_drawing_context();
+	xlsx_drawing_context & get_drawing_context();
 
 	//xlsx_comments_context & get_comments_context();
 	//
-
+	table_state_ptr & state();
 
 	std::wstring	add_hyperlink(std::wstring const & ref, std::wstring const & target, std::wstring const & display);
 	void			dump_rels_hyperlinks(rels & Rels);
@@ -46,8 +43,9 @@ public:
 
 private:
     xlsx_conversion_context		& context_;
-    xlsx_text_context			& xlsx_text_context_;
-	xlsx_hyperlinks				xlsx_hyperlinks_;
+    //xlsx_text_context			& xlsx_text_context_;
+
+	std::list<table_state_ptr>		tables_state_;
 };
 
 

ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj

@@ -356,6 +356,22 @@
 				RelativePath="..\XlsXlsxConverter\xlsx_conversion_context.h"
 				>
 			</File>
+			<File
+				RelativePath="..\XlsXlsxConverter\xlsx_drawing_context.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\XlsXlsxConverter\xlsx_drawing_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\XlsXlsxConverter\xlsx_drawings.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\XlsXlsxConverter\xlsx_drawings.h"
+				>
+			</File>
 			<File
 				RelativePath="..\XlsXlsxConverter\xlsx_hyperlinks.cpp"
 				>