выпиливание boost'a

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

Common/ASCDocxFormat/Projects/XML2005.vcproj

@@ -258,42 +258,6 @@
 				RelativePath="..\Source\XML\Extension\Fill.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Source\XML\Extension\FillFromAttribute.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\XML\Extension\Write.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\XML\Extension\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\XML\Extension\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\Source\XML\Extension\Write.h"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\XML\Extension\WriteIf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Source\XML\Extension\WriteIf.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Limit"

Common/ASCDocxFormat/Source/DocxFormat/Document.cpp

@@ -29,7 +29,7 @@ namespace OOX
 	{
 		IFileContainer::read(filename);
 
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		const XML::XElement element = document.Root.element("body");
 		SectorProperty = element.element("sectPr");
 		Background	   = document.Root.element("background");

Common/ASCDocxFormat/Source/DocxFormat/EndNote.cpp

@@ -28,7 +28,7 @@ namespace OOX
 	{
 		IFileContainer::read(filename);
 
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		XML::Fill(Notes, document.Root, "endnote");
 	}
 

Common/ASCDocxFormat/Source/DocxFormat/EndNote/Note.cpp

@@ -37,13 +37,15 @@ namespace OOX
 
 
 	const XML::XNode EndNote::Note::toXML() const
-	{			
-		return
-			XML::XElement(ns.w + "endnote",
-			  XML::XAttribute(ns.w + "type", Type) +
-				XML::XAttribute(ns.w + "id", Id) +
-				XML::Write(Items)
-			);
+	{	
+		return XML::XElement();
+
+		//return
+		//	XML::XElement(ns.w + "endnote",
+		//	  XML::XAttribute(ns.w + "type", Type) +
+		//		XML::XAttribute(ns.w + "id", Id) +
+		//		XML::Write(Items)
+		//	);
 	}
 
 

Common/ASCDocxFormat/Source/DocxFormat/FootNote.cpp

@@ -28,7 +28,7 @@ namespace OOX
 	{
 		IFileContainer::read(filename);
 
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		XML::Fill(Notes, document.Root, "footnote");	
 	}
 

Common/ASCDocxFormat/Source/DocxFormat/FootNote/Note.cpp

@@ -36,12 +36,14 @@ namespace OOX
 
 	const XML::XNode FootNote::Note::toXML() const
 	{
-		return
-			XML::XElement(ns.w + "footnote",
-				XML::XAttribute(ns.w + "type", Type) +
-				XML::XAttribute(ns.w + "id", Id) +
-				XML::Write(Items)
-			);
+		return XML::XElement();
+
+		//return
+		//	XML::XElement(ns.w + "footnote",
+		//		XML::XAttribute(ns.w + "type", Type) +
+		//		XML::XAttribute(ns.w + "id", Id) +
+		//		XML::Write(Items)
+		//	);
 	}
 
 	void FootNote::Note::push_back(const OOX::Logic::Paragraph& paragraph)

Common/ASCDocxFormat/Source/DocxFormat/Footer.cpp

@@ -53,7 +53,7 @@ namespace OOX
 		//	}
 		//}
 
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		XML::Fill(m_items, document.Root, "p", "tbl", "sdt");
 	}
 

Common/ASCDocxFormat/Source/DocxFormat/Header.cpp

@@ -53,7 +53,7 @@ namespace OOX
 		//	}
 		//}
 
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		XML::Fill(m_items, document.Root, "p", "tbl", "sdt");
 	}
 

Common/ASCDocxFormat/Source/DocxFormat/Item.cpp

@@ -28,7 +28,7 @@ namespace OOX
 
 	void Item::read(const OOX::CPath& filename)
 	{
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		SelectedStyle = document.Root.attribute("SelectedStyle").value();
 		StyleName			= document.Root.attribute("StyleName").value();
 	}

Common/ASCDocxFormat/Source/DocxFormat/ItemProps.cpp

@@ -28,7 +28,7 @@ namespace OOX
 
 	void ItemProps::read(const OOX::CPath& filename)
 	{
-		const	XML::XDocument document(filename.GetPath());
+		const	XML::XDocument document(filename);
 		//Refs		= document.Root.element("schemaRefs");
 		ItemID	= document.Root.attribute("itemID").value();
 	}

Common/ASCDocxFormat/Source/DocxFormat/ItemProps/SchemaRef.cpp

@@ -41,10 +41,7 @@ namespace OOX
 
 	const XML::XNode ItemProps::SchemaRef::toXML() const
 	{
-		return 
-			XML::XElement(ns.ds + "schemaRef",
-				XML::XAttribute(ns.ds + "uri", Uri)
-			);
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/ItemProps/SchemaRefs.cpp

@@ -41,7 +41,7 @@ namespace OOX
 
 	const XML::XNode ItemProps::SchemaRefs::toXML() const
 	{
-		return XML::XElement(ns.ds + "schemaRefs",	XML::Write(SchemaRef));
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/Background.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode Background::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "background", 
-					XML::XAttribute(ns.w + "color", Color) + 
-					XML::XAttribute(ns.w + "themeColor", ThemeColor) + 
-					XML::XAttribute(ns.w + "themeShade", ThemeShade)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/BookmarkEnd.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode BookmarkEnd::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "bookmarkEnd",
-					XML::XAttribute(ns.w + "id", Id)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/BookmarkEndParagraph.cpp

@@ -55,7 +55,7 @@ namespace OOX
 
 		const XML::XNode BookmarkEndParagraph::toXML() const
 		{
-			return 	XML::XElement();	//ns.w + "bookmarkEnd",			//		XML::XAttribute(ns.w + "id", Id)			//	);
+		return XML::XElement();
 		}
 
 		const std::string BookmarkEndParagraph::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/BookmarkStart.cpp

@@ -58,11 +58,7 @@ namespace OOX
 
 		const XML::XNode BookmarkStart::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "bookmarkStart",
-					XML::XAttribute(ns.w + "id", Id) + 
-					XML::XAttribute(ns.w + "name", Name)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/BookmarkStartParagraph.cpp

@@ -60,11 +60,7 @@ namespace OOX
 
 		const XML::XNode BookmarkStartParagraph::toXML() const
 		{
-			return XML::XElement();
-				//XML::XElement(ns.w + "bookmarkStart",
-				//	XML::XAttribute(ns.w + "id", Id) + 
-				//	XML::XAttribute(ns.w + "name", Name)
-				//);
+		return XML::XElement();
 		}
 
 		const std::string BookmarkStartParagraph::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/Border.cpp

@@ -58,14 +58,7 @@ namespace OOX
 
 		const XML::XNode Border::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + Name.ToString(),
-					XML::XAttribute(ns.w + "val", Bdr->Value) +	
-					XML::XAttribute(ns.w + "sz", Bdr->Sz) +	
-					XML::XAttribute(ns.w + "space", Bdr->Space) +	
-					XML::XAttribute(ns.w + "color", Bdr->Color) +	
-					XML::XAttribute(ns.w + "themeColor", Bdr->ThemeColor)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Bottom.cpp

@@ -48,15 +48,7 @@ namespace OOX
 
 		const XML::XNode Bottom::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "bottom",
-					XML::XAttribute(ns.w + "val", Value) + 
-					XML::XAttribute(ns.w + "space", Space) +
-					XML::XAttribute(ns.w + "sz", Size) +
-					XML::XAttribute(ns.w + "color", Color) +
-					XML::XAttribute(ns.w + "themeColor", ThemeColor) +
-					XML::XAttribute(ns.w + "themeShade", ThemeShade)
-				);
+		return XML::XElement();
 		}
 	} // namespace Logic
 } // namespace OOX

Common/ASCDocxFormat/Source/DocxFormat/Logic/Break.cpp

@@ -63,11 +63,7 @@ namespace OOX
 
 		const XML::XNode Break::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "br", 
-					XML::XAttribute(ns.w + "type", Type) + 
-					XML::XAttribute(ns.w + "clear", Clear)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Column.cpp

@@ -52,11 +52,7 @@ namespace OOX
 
 		const XML::XNode Column::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "col", 
-					XML::XAttribute(ns.w + "w", Width) +
-					XML::XAttribute(ns.w + "space", Space)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Columns.cpp

@@ -51,14 +51,7 @@ namespace OOX
 
 		const XML::XNode Columns::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "cols", 
-					XML::XAttribute(ns.w + "num", Num) +
-					XML::XAttribute(ns.w + "sep", Sep) +
-					XML::XAttribute(ns.w + "space", Space) +
-					XML::XAttribute(ns.w + "equalWidth", EqualWidth) +					
-					XML::Write(Items)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Complex.cpp

@@ -43,7 +43,7 @@ namespace OOX
 		
 		const XML::XNode Complex::toXML() const
 		{			
-			return XML::XElement(ns.o + "complex", XML::XAttribute(ns.v + "ext", Ext));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/ContinuationSeparator.cpp

@@ -41,7 +41,7 @@ namespace OOX
 
 		const XML::XNode ContinuationSeparator::toXML() const
 		{
-			return XML::XElement(ns.w + "continuationSeparator");
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/DelText.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode DelText::toXML() const
 		{
-			return XML::XElement(ns.w + "delText", XML::XText(Text));
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Delete.cpp

@@ -48,13 +48,7 @@ namespace OOX
 
 		const XML::XNode Delete::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "del",
-				    XML::XAttribute(ns.w + "id", Id) +
-					XML::XAttribute(ns.w + "author", Author) +
-					XML::XAttribute(ns.w + "date", Date) +
-					XML::Write(Runs)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/DocPartObj.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode DocPartObj::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "docPartObj",
-					XML::Write(ns.w + "docPartGallery", ns.w + "val", Gallery) +
-					XML::WriteIf(XML::XElement(ns.w + "docPartUnique"), Unique)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/DocPr.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode DocPr::toXML() const
 		{
-			return
-				XML::XElement(ns.wp + "docPr", 
-					XML::XAttribute("id", Id) +
-					XML::XAttribute("name", Name) +
-					XML::XAttribute("descr", Descr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/DocumentGrid.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode DocumentGrid::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "docGrid", 
-					XML::XAttribute(ns.w + "linePitch", LinePitch) +
-					XML::XAttribute(ns.w + "charSpace", CharSpace) +
-					XML::XAttribute(ns.w + "type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Drawing.cpp

@@ -174,7 +174,7 @@ namespace OOX
 
 		const XML::XNode Drawing::toXML() const
 		{
-			return XML::XElement(ns.w + "drawing", XML::Write(Inline));
+			return XML::XElement();
 		}
 
 		const std::string Drawing::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/DrawingWrap.cpp

@@ -70,45 +70,46 @@ namespace OOX
 
 		const XML::XNode DrawingWrap::toXML() const
 		{
-			if (*Type == "wrapSquare")
-			{
-				return XML::XElement(ns.wp + "wrapSquare",
-					XML::XAttribute("wrapText", TextWrap) +
-					XML::XAttribute("distT", DistT) +
-					XML::XAttribute("distB", DistB) +
-					XML::XAttribute("distL", DistL) +
-					XML::XAttribute("distR", DistR) +
-					XML::Write(EffectExtent)
-					);
-			}
-			else if (*Type == "wrapTopAndBottom")
-			{
-				return XML::XElement(ns.wp + "wrapTopAndBottom",
-					XML::XAttribute("distT", DistT) +
-					XML::XAttribute("distB", DistB) +
-					XML::Write(EffectExtent)
-					);
-			}
-			else if (*Type == "wrapTight")
-			{
-				return XML::XElement(ns.wp + "wrapTight",
-					XML::XAttribute("wrapText", TextWrap) +
-					XML::XAttribute("distL", DistL) +
-					XML::XAttribute("distR", DistR) +
-					XML::Write(WrapPath)
-					);
-			}
-			else if (*Type == "wrapThrough")
-			{
-				return XML::XElement(ns.wp + "wrapThrough",
-					XML::XAttribute("wrapText", TextWrap) +
-					XML::XAttribute("distL", DistL) +
-					XML::XAttribute("distR", DistR) +
-					XML::Write(WrapPath)
-					);
-			}
+			return XML::XElement();//
+			//if (*Type == "wrapSquare")
+			//{
+			//	return XML::XElement(ns.wp + "wrapSquare",
+			//		XML::XAttribute("wrapText", TextWrap) +
+			//		XML::XAttribute("distT", DistT) +
+			//		XML::XAttribute("distB", DistB) +
+			//		XML::XAttribute("distL", DistL) +
+			//		XML::XAttribute("distR", DistR) +
+			//		XML::Write(EffectExtent)
+			//		);
+			//}
+			//else if (*Type == "wrapTopAndBottom")
+			//{
+			//	return XML::XElement(ns.wp + "wrapTopAndBottom",
+			//		XML::XAttribute("distT", DistT) +
+			//		XML::XAttribute("distB", DistB) +
+			//		XML::Write(EffectExtent)
+			//		);
+			//}
+			//else if (*Type == "wrapTight")
+			//{
+			//	return XML::XElement(ns.wp + "wrapTight",
+			//		XML::XAttribute("wrapText", TextWrap) +
+			//		XML::XAttribute("distL", DistL) +
+			//		XML::XAttribute("distR", DistR) +
+			//		XML::Write(WrapPath)
+			//		);
+			//}
+			//else if (*Type == "wrapThrough")
+			//{
+			//	return XML::XElement(ns.wp + "wrapThrough",
+			//		XML::XAttribute("wrapText", TextWrap) +
+			//		XML::XAttribute("distL", DistL) +
+			//		XML::XAttribute("distR", DistR) +
+			//		XML::Write(WrapPath)
+			//		);
+			//}
 
-			return XML::XElement(ns.wp + "wrapNone");
+			//return XML::XElement(ns.wp + "wrapNone");
 		}
 	} // namespace Logic
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/EffectExtent.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode EffectExtent::toXML() const
 		{
-			return
-				XML::XElement(ns.wp + "effectExtent", 
-					XML::XAttribute("l", Left) +
-					XML::XAttribute("t", Top) +
-					XML::XAttribute("r", Right) +
-					XML::XAttribute("b", Bottom)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/EndNoteProperty.cpp

@@ -51,11 +51,7 @@ namespace OOX
 
 		const XML::XNode EndNoteProperty::toXML() const
 		{
-			return XML::XNode();
-			//	XML::XElement(ns.w + "endnotePr",
-			//		XML::Write(NumFormat) +
-			//		XML::Write(ns.w + "numStart", ns.w + "val", NumStart)
-			//	);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/EndnoteReference.cpp

@@ -50,10 +50,7 @@ namespace OOX
 
 		const XML::XNode EndnoteReference::toXML() const
 		{
-			return XML::XElement(ns.w + "endnoteReference", 
-							XML::XAttribute(ns.w + "customMarkFollows", CustomMarkFollows) +
-							XML::XAttribute(ns.w + "id", Id)
-						);
+		return XML::XElement();
 		}
 
 		const std::string EndnoteReference::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/Extrusion.cpp

@@ -51,18 +51,7 @@ namespace OOX
 		
 		const XML::XNode Extrusion::toXML() const
 		{			
-			return
-				XML::XElement(ns.o + "extrusion",					
-					XML::XAttribute("on", On) +
-					XML::XAttribute(ns.v + "ext", Ext) +
-					XML::XAttribute("backdepth", BackDepth) +
-					XML::XAttribute("viewpoint", ViewPoint) +
-					XML::XAttribute("viewpointorigin", ViewPointOrigin) +
-					XML::XAttribute("skewangle", SkewAngle) +
-					XML::XAttribute("lightposition", LightPosition) +
-					XML::XAttribute("lightposition2", LightPosition2) +
-					XML::XAttribute("type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/F.cpp

@@ -43,8 +43,7 @@ namespace OOX
 		
 		const XML::XNode F::toXML() const
 		{			
-			return XML::XElement("f",XML::XAttribute("eqn", Eqn));
-			//return XML::XElement(ns.v + "f",XML::XAttribute("eqn", Eqn));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/FieldCodes.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode FieldCodes::toXML() const
 		{
-			return XML::XElement(ns.o + "FieldCodes", XML::XText(Text));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Fill.cpp

@@ -48,15 +48,7 @@ namespace OOX
 		
 		const XML::XNode Fill::toXML() const
 		{			
-			return
-				XML::XElement(ns.v + "fill",
-					XML::XAttribute("color2", Color) +
-					XML::XAttribute("rotate", Rotate) +
-					XML::XAttribute("colors", Colors) +
-					XML::XAttribute("method", Method) +
-					XML::XAttribute("focus", Focus) +
-					XML::XAttribute("type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/FldChar.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode FldChar::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "fldChar",
-					XML::XAttribute(ns.w + "fldCharType", FldCharType)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/FldSimple.cpp

@@ -44,11 +44,13 @@ namespace OOX
 
 		const XML::XNode FldSimple::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "fldSimple", 
-					XML::XAttribute(ns.w + "instr", Instr) +
-					XML::Write(Run)
-				);
+			return XML::XElement();
+
+			//return
+			//	XML::XElement(ns.w + "fldSimple", 
+			//		XML::XAttribute(ns.w + "instr", Instr) +
+			//		XML::Write(Run)
+			//	);
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/FootNoteProperty.cpp

@@ -52,11 +52,7 @@ namespace OOX
 
 		const XML::XNode FootNoteProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "footnotePr",
-					XML::Write(NumFormat) +
-					XML::Write(ns.w + "numStart", ns.w + "val", NumStart)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/FooterReference.cpp

@@ -44,13 +44,7 @@ namespace OOX
 
 		const XML::XNode FooterReference::toXML() const
 		{
-			return XML::XElement();
-
-			//return
-			//	XML::XElement(ns.w + "footerReference", 
-			//		XML::XAttribute(ns.r + "id", rId) +
-			//		XML::XAttribute(ns.w + "type", Type)
-			//	);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/FootnoteReference.cpp

@@ -50,10 +50,7 @@ namespace OOX
 
 		const XML::XNode FootnoteReference::toXML() const
 		{
-			return XML::XElement(ns.w + "footnoteReference", 
-							XML::XAttribute(ns.w + "customMarkFollows", CustomMarkFollows) +
-							XML::XAttribute(ns.w + "id", Id)							
-						);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Formulas.cpp

@@ -40,9 +40,8 @@ namespace OOX
 		}
 		
 		const XML::XNode Formulas::toXML() const
-		{			
-			//return XML::XElement(ns.v + "formulas", XML::Write(Fs));
-			return XML::XElement("formulas", XML::Write(Fs));
+		{	
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Graphic.cpp

@@ -44,13 +44,7 @@ namespace OOX
 
 		const XML::XNode Graphic::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "graphic", 
-					XML::XElement(ns.a + "graphicData", 
-						XML::XAttribute("uri", Uri) + 
-						XML::Write(Pic)
-					)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/GridColumn.cpp

@@ -38,7 +38,7 @@ namespace OOX
 
 		const XML::XNode GridColumn::toXML() const
 		{
-			return XML::XElement(ns.w + "gridCol", XML::XAttribute(ns.w + "w", Width));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Group.cpp

@@ -94,7 +94,7 @@ namespace OOX
 
 		const XML::XNode GroupItem::toXML() const
 		{
-			return XML::XNode(); //XML::Write(m_item);
+		return XML::XElement();
 		}
 	}
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/H.cpp

@@ -45,13 +45,7 @@ namespace OOX
 
 		const XML::XNode H::toXML() const
 		{
-			return
-				XML::XElement(ns.v + "h",
-					XML::XAttribute("position", Position) +
-					XML::XAttribute("xrange", XRange) +
-					XML::XAttribute("yrange", YRange)
-					
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Handles.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode Handles::toXML() const
 		{
-			return XML::XElement(ns.v + "handles", XML::Write(Hs));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/HeaderReference.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode HeaderReference::toXML() const
 		{
-			return XML::XElement();
-			//	XML::XElement(ns.w + "headerReference", 
-			//		XML::XAttribute(ns.r + "id", rId) +
-			//		XML::XAttribute(ns.w + "type", Type)
-			//	);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp

@@ -42,13 +42,7 @@ namespace OOX
 
 		const XML::XNode Hyperlink::toXML() const
 		{
-			return XML::XElement();
-				//XML::XElement(ns.w + "hyperlink",
-				//	XML::XAttribute(ns.r + "id", rId) +
-				//	XML::XAttribute(ns.w + "anchor", Anchor) +
-				//	XML::XAttribute(ns.w + "history", History) +
-				//	XML::Write(Runs)
-				//);
+		return XML::XElement();
 		}
 
 		const std::string Hyperlink::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/ImageData.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode ImageData::toXML() const
 		{
-			return XML::XElement();
-				//XML::XElement(ns.v + "imagedata", 
-				//	XML::XAttribute(ns.r + "id", rId) +
-				//	XML::XAttribute(ns.o + "title", Title) 
-				//);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Ind.cpp

@@ -69,13 +69,7 @@ namespace OOX
 
 		const XML::XNode Ind::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "ind",
-					XML::XAttribute(ns.w + "left", Left) +
-					XML::XAttribute(ns.w + "right", Right) +
-					XML::XAttribute(ns.w + "hanging", Hanging) +
-					XML::XAttribute(ns.w + "firstLine", FirstLine)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Inline.cpp

@@ -95,52 +95,52 @@ namespace OOX
 
 		const XML::XNode Inline::toXML() const
 		{
-			return
-				XML::XElement(ns.wp + Name.ToString(), 
-					XML::XAttribute("distT", DistT) +
-					XML::XAttribute("distB", DistB) +
-					XML::XAttribute("distL", DistL) +
-					XML::XAttribute("distR", DistR) +
-
-					XML::XAttribute("simplePos", SimplePos) +
-					XML::XAttribute("relativeHeight", RelativeHeight) +
-					XML::XAttribute("behindDoc", BehindDoc) +
-					XML::XAttribute("locked", Locked) +
-					XML::XAttribute("layoutInCell", LayoutInCell) +
-					XML::XAttribute("allowOverlap", AllowOverlap) +
-
-					XML::Write(SimplePosPoint) +
-					WriteIf(
-						XML::XElement(ns.wp + "positionH",
-							XML::XAttribute("relativeFrom", positionHRelativeFrom.get_value_or("column")) +
-							WriteIf( XML::XElement(ns.wp + "posOffset",
-								XML::XText(positionH)
-							), positionH.is_init()) +
-							WriteIf( XML::XElement(ns.wp + "align",
-								XML::XText(positionHAlign)
-							), positionHAlign.is_init())
-						), positionH.is_init() || positionHAlign.is_init()) +
-					WriteIf(
-						XML::XElement(ns.wp + "positionV",
-							XML::XAttribute("relativeFrom", positionVRelativeFrom.get_value_or("paragraph")) +
-							WriteIf( XML::XElement(ns.wp + "posOffset",
-								XML::XText(positionV)
-							), positionV.is_init()) +
-							WriteIf( XML::XElement(ns.wp + "align",
-								XML::XText(positionVAlign)
-							), positionVAlign.is_init())
-						), positionV.is_init() || positionVAlign.is_init()) +
-					XML::Write(Extent) +
-					XML::Write(EffectExtent) +
-					XML::Write(Wrap) +
-					XML::Write(DocPr) +
-						XML::XElement(ns.wp + "cNvGraphicFramePr",
-							XML::XElement(ns.a + "graphicFrameLocks",
-								XML::XAttribute("noChangeAspect", NoChangeAspect)
-							)
-						) +
-					XML::Write(Graphic)
-				);
+			return XML::XElement();
+				//XML::XElement(ns.wp + Name.ToString(), 
+				//	XML::XAttribute("distT", DistT) +
+				//	XML::XAttribute("distB", DistB) +
+				//	XML::XAttribute("distL", DistL) +
+				//	XML::XAttribute("distR", DistR) +
+
+				//	XML::XAttribute("simplePos", SimplePos) +
+				//	XML::XAttribute("relativeHeight", RelativeHeight) +
+				//	XML::XAttribute("behindDoc", BehindDoc) +
+				//	XML::XAttribute("locked", Locked) +
+				//	XML::XAttribute("layoutInCell", LayoutInCell) +
+				//	XML::XAttribute("allowOverlap", AllowOverlap) +
+
+				//	XML::Write(SimplePosPoint) +
+				//	WriteIf(
+				//		XML::XElement(ns.wp + "positionH",
+				//			XML::XAttribute("relativeFrom", positionHRelativeFrom.get_value_or("column")) +
+				//			WriteIf( XML::XElement(ns.wp + "posOffset",
+				//				XML::XText(positionH)
+				//			), positionH.is_init()) +
+				//			WriteIf( XML::XElement(ns.wp + "align",
+				//				XML::XText(positionHAlign)
+				//			), positionHAlign.is_init())
+				//		), positionH.is_init() || positionHAlign.is_init()) +
+				//	WriteIf(
+				//		XML::XElement(ns.wp + "positionV",
+				//			XML::XAttribute("relativeFrom", positionVRelativeFrom.get_value_or("paragraph")) +
+				//			WriteIf( XML::XElement(ns.wp + "posOffset",
+				//				XML::XText(positionV)
+				//			), positionV.is_init()) +
+				//			WriteIf( XML::XElement(ns.wp + "align",
+				//				XML::XText(positionVAlign)
+				//			), positionVAlign.is_init())
+				//		), positionV.is_init() || positionVAlign.is_init()) +
+				//	XML::Write(Extent) +
+				//	XML::Write(EffectExtent) +
+				//	XML::Write(Wrap) +
+				//	XML::Write(DocPr) +
+				//		XML::XElement(ns.wp + "cNvGraphicFramePr",
+				//			XML::XElement(ns.a + "graphicFrameLocks",
+				//				XML::XAttribute("noChangeAspect", NoChangeAspect)
+				//			)
+				//		) +
+				//	XML::Write(Graphic)
+				//);
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Insert.cpp

@@ -48,13 +48,7 @@ namespace OOX
 
 		const XML::XNode Insert::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "ins",
-				    XML::XAttribute(ns.w + "id", Id) +
-					XML::XAttribute(ns.w + "author", Author) +
-					XML::XAttribute(ns.w + "date", Date) +
-					XML::Write(Runs)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/InstrText.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode InstrText::toXML() const
 		{
-			return XML::XElement(ns.w + "instrText", XML::XText(Text));
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Lang.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode Lang::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "lang",
-					XML::XAttribute(ns.w + "val", Value) +
-					XML::XAttribute(ns.w + "eastAsia", EastAsia) +
-					XML::XAttribute(ns.w + "bidi", Bidi)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/LnNumType.cpp

@@ -42,11 +42,7 @@ namespace OOX
 
 		const XML::XNode LnNumType::toXML() const
 		{
-			return XML::XElement(ns.w + "lnNumType",
-				XML::XAttribute(ns.w + "countBy", countBy) +
-				XML::XAttribute(ns.w + "start", start) +
-				//XML::XAttribute(ns.w + "distance", distance) +
-				XML::XAttribute(ns.w + "restart", restart) );
+		return XML::XElement();
 		}
 	}
 }
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/Lock.cpp

@@ -46,13 +46,7 @@ namespace OOX
 		
 		const XML::XNode Lock::toXML() const
 		{			
-			return
-				XML::XElement(ns.o + "lock",
-					XML::XAttribute("aspectratio", Aspectratio) +
-					XML::XAttribute(ns.v + "ext", Ext) +
-					XML::XAttribute("text", Text) +
-					XML::XAttribute("shapetype", ShapeType)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/NumFormat.cpp

@@ -72,10 +72,7 @@ namespace OOX
 
 		const XML::XNode NumFormat::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "numFmt",
-				XML::XAttribute(ns.w + "val", ToString())
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/NumPr.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode NumPr::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "numPr",
-					XML::Write(ns.w + "ilvl", ns.w + "val", Ilvl) +
-					XML::XElement(ns.w + "numId", XML::XAttribute(ns.w + "val", NumId))
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/OleObject.cpp

@@ -50,16 +50,7 @@ namespace OOX
 
 		const XML::XNode OleObject::toXML() const
 		{			
-			return XML::XElement();
-				//XML::XElement(ns.o + "OLEObject",
-				//	XML::XAttribute("Type", Type) +
-				//	XML::XAttribute("ProgID", ProgId) +
-				//	XML::XAttribute("ShapeID", ShapeId) +
-				//	XML::XAttribute("DrawAspect", DrawAspect) +
-				//	XML::XAttribute("ObjectID", ObjectId) +
-				//	XML::XAttribute(ns.r + "id", rId) +
-				//	XML::Write(FieldCodes)
-				//);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Oval.cpp

@@ -47,8 +47,8 @@ namespace OOX
 		}
 
 		const XML::XNode Oval::toXML() const
-		{			
-			return XML::XElement(ns.v + "oval", XML::XAttribute("id", Id) +	XML::XAttribute("style", style.ToString()) + XML::Write(Wrap));
+		{	
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/PageBorders.cpp

@@ -44,9 +44,7 @@ namespace OOX
 
 		const XML::XNode PageBorders::toXML() const
 		{
-			return XML::XElement(ns.w + "pgBorders",
-				XML::XAttribute(ns.w + "offsetFrom", OffsetFrom) +
-				XML::Write(Top) + XML::Write(Bottom) + XML::Write(Left) + XML::Write(Right));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/PageMargin.cpp

@@ -49,16 +49,7 @@ namespace OOX
 
 		const XML::XNode PageMargin::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "pgMar",
-					XML::XAttribute(ns.w + "top", Top) +
-					XML::XAttribute(ns.w + "right", Right) +
-					XML::XAttribute(ns.w + "bottom", Bottom) +
-					XML::XAttribute(ns.w + "left", Left) +
-					XML::XAttribute(ns.w + "header", Header) +
-					XML::XAttribute(ns.w + "footer", Footer) +
-					XML::XAttribute(ns.w + "gutter", Gutter)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/PageSize.cpp

@@ -41,10 +41,7 @@ namespace OOX
 
 		const XML::XNode PageSize::toXML() const
 		{
-			return XML::XElement(ns.w + "pgSz",
-				XML::XAttribute(ns.w + "w", Width) +
-				XML::XAttribute(ns.w + "h", Height) +
-				XML::XAttribute(ns.w + "orient", Orient));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Paragraph.cpp

@@ -85,11 +85,7 @@ namespace OOX
 
 		const XML::XNode Paragraph::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "p",
-					XML::Write(Property) + 
-					XML::Write(Items)
-			);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/ParagraphBorder.cpp

@@ -46,12 +46,7 @@ namespace OOX
 
 		const XML::XNode ParagraphBorder::toXML() const
 		{
-			return XML::XElement(ns.w + "pBdr",
-						XML::Write(Top) +
-						XML::Write(Bottom) +
-						XML::Write(Left) +
-						XML::Write(Right)
-					);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/ParagraphProperty.cpp

@@ -69,28 +69,7 @@ namespace OOX
 
 		const XML::XNode ParagraphProperty::toXML() const
 		{
-			return	XML::XElement(ns.w + "pPr", 
-				XML::Write(RunProperty) +
-				XML::Write(SectorProperty) +
-				XML::Write(ns.w + "pStyle", ns.w + "val", PStyle) +
-				XML::WriteIf(XML::XElement(ns.w + "keepNext"), KeepNext) +
-				XML::WriteIf(XML::XElement(ns.w + "keepLines"), KeepLines) +
-				XML::WriteIf(XML::XElement(ns.w + "pageBreakBefore"), pageBreakBefore) +
-				XML::Write(TextFrameProperties) +
-				XML::Write(ns.w + "widowControl", ns.w + "val", WidowControl) +
-				XML::Write(NumPr) +
-				XML::Write(Spacing) +
-				XML::WriteIf(XML::XElement(ns.w + "suppressLineNumbers"), SuppressLineNumbers) +
-				XML::Write(ParagraphBorder) +
-				//XML::Write(ns.w + "shd", ns.w + "fill", Background) +
-				XML::Write(Shading) +
-				XML::Write(Tabs) +
-				XML::Write(Ind) +
-				XML::WriteIf(XML::XElement(ns.w + "contextualSpacing"), ContextualSpacing) +
-				XML::Write(ns.w + "jc", ns.w + "val", Align) +
-				XML::Write(ns.w + "textAlignment", ns.w + "val", TextAlignment) +
-				XML::Write(ns.w + "outlineLvl", ns.w + "val", OutlineLvl) +
-				XML::Write(PropertyChange));
+		return XML::XElement();
 		}
 
 		const bool ParagraphProperty::isSimple() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/ParagraphPropertyChange.cpp

@@ -39,12 +39,7 @@ namespace OOX
 
 		const XML::XNode ParagraphPropertyChange::toXML() const
 		{
-			return XML::XElement();
-				//XML::XElement(ns.w + "pPrChange",
-				//    XML::XAttribute(ns.w + "id", Id) +
-				//	XML::XAttribute(ns.w + "author", Author) +
-				//	XML::XAttribute(ns.w + "date", Date)
-				//);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Path.cpp

@@ -52,18 +52,7 @@ namespace OOX
 		
 		const XML::XNode Path::toXML() const
 		{			
-			return
-				XML::XElement(ns.v + "shape",
-					XML::XAttribute("arrowok", ArrowOk) +
-					XML::XAttribute(ns.o + "extrusionok", ExtrusionOk) +
-					XML::XAttribute("gradientshapeok", GradientShapeOk) +
-					XML::XAttribute("textpathok", TextPathOk) +
-					XML::XAttribute(ns.o + "connecttype", ConnectType) +
-					XML::XAttribute(ns.o + "connectlocs", ConnectLocs) +
-					XML::XAttribute("textboxrect", TextBoxRect) +
-					XML::XAttribute("limo", Limo) +
-					XML::XAttribute(ns.o + "connectangles", ConnectAngles)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Pict.cpp

@@ -53,18 +53,7 @@ namespace OOX
 
 		const XML::XNode Pict::toXML() const
 		{
-			return
-				XML::XElement(ns.w + name.ToString(), 
-					XML::XAttribute(ns.w + "dxaOrig", DxaOrig)	+
-					XML::XAttribute(ns.w + "dyaOrig", DyaOrig)	+					
-					XML::Write(shapetype)						+
-					XML::Write(shape)							+
-					XML::Write(rect)							+
-					XML::Write(oval)							+
-					XML::Write(line)							+
-					XML::Write(roundrect)						+
-					XML::Write(OleObject)
-				);
+		return XML::XElement();
 		}
 
 		const std::string Pict::toTxt() const

Common/ASCDocxFormat/Source/DocxFormat/Logic/Point2D.cpp

@@ -46,10 +46,7 @@ namespace OOX
 
 		const XML::XNode Point2D::toXML() const
 		{
-			return XML::XElement(ns.wp + *name,
-				XML::XAttribute("x", x) +
-				XML::XAttribute("y", y)
-				);
+		return XML::XElement();
 		}
 	} // namespace Logic
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/RFonts.cpp

@@ -47,18 +47,7 @@ namespace OOX
 
 		const XML::XNode RFonts::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "rFonts",
-					XML::XAttribute(ns.w + "asciiTheme", AsciiTheme) +
-					XML::XAttribute(ns.w + "eastAsiaTheme", EastAsiaTheme) +
-					XML::XAttribute(ns.w + "hAnsiTheme", HAnsiTheme) +
-					XML::XAttribute(ns.w + "cstheme", Cstheme) +
-					XML::XAttribute(ns.w + "hint", Hint) +
-					XML::XAttribute(ns.w + "ascii", ascii) +
-					XML::XAttribute(ns.w + "eastAsia", EastAsia) +
-					XML::XAttribute(ns.w + "hAnsi", hAnsi) +
-					XML::XAttribute(ns.w + "cs", Cs)
-				);
+		return XML::XElement();
 		}
 
 		void RFonts::setFontName(const nullable__<std::string>& fontName)

Common/ASCDocxFormat/Source/DocxFormat/Logic/Rect.cpp

@@ -48,7 +48,7 @@ namespace OOX
 
 		const XML::XNode Rect::toXML() const
 		{			
-			return XML::XElement(ns.v + "rect", XML::XAttribute("id", Id) + XML::XAttribute("style", style.ToString()) + XML::Write(Wrap));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Roundrect.cpp

@@ -48,8 +48,8 @@ namespace OOX
 		}
 		
 		const XML::XNode Roundrect::toXML() const
-		{			
-			return XML::XElement(ns.v + "rect", XML::XAttribute("id", Id) +	XML::XAttribute("style", style.ToString()) + XML::XAttribute("arcsize", arcsize) + XML::Write(Wrap));
+		{	
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Run.cpp

@@ -111,11 +111,7 @@ namespace OOX
 
 		const XML::XNode Run::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "r", 
-					XML::Write(Property) +
-					XML::Write(Items)
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/RunItem.cpp

@@ -117,7 +117,7 @@ namespace OOX
 
 		const XML::XNode RunItem::toXML() const
 		{
-			return XML::XNode(); //	return XML::Write(m_item);
+		return XML::XElement();
 		}
 
 		void RunItem::fromTxt(const std::string& text)

Common/ASCDocxFormat/Source/DocxFormat/Logic/RunProperty.cpp

@@ -153,55 +153,9 @@ namespace OOX
 
 		const XML::XNode RunProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "rPr",
-					//XML::WriteIf(XML::XElement(ns.w + "b"), Bold) +
-					//XML::WriteIf(XML::XElement(ns.w + "i"), Italic) +
-					XML::WriteIf(XML::XElement(ns.w + "b", XML::XAttribute(ns.w + "val", Bold)), Bold.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "i", XML::XAttribute(ns.w + "val", Italic)), Italic.is_init()) +
-					//XML::WriteIf(XML::XElement(ns.w + "strike"), Strike) +
-					//XML::WriteIf(XML::XElement(ns.w + "dstrike"), DStrike) +
-					XML::WriteIf(XML::XElement(ns.w + "strike", XML::XAttribute(ns.w + "val", Strike)), Strike.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "dstrike", XML::XAttribute(ns.w + "val", DStrike)), DStrike.is_init()) +
-
-					XML::WriteIf(XML::XElement(ns.w + "u", XML::XAttribute(ns.w + "val", UnderType.get_value_or("single"))), Under) +
-					//XML::WriteIf(XML::XElement(ns.w + "smallCaps"), SmallCaps) +
-					//XML::WriteIf(XML::XElement(ns.w + "caps"), Caps) +
-					//XML::WriteIf(XML::XElement(ns.w + "emboss"), Emboss) +
-					//XML::WriteIf(XML::XElement(ns.w + "imprint"), Imprint) +
-					//XML::WriteIf(XML::XElement(ns.w + "outline"), Outline) +
-					//XML::WriteIf(XML::XElement(ns.w + "shadow"), Shadow) +
-					//XML::WriteIf(XML::XElement(ns.w + "vanish"), Vanish) +
-					//XML::WriteIf(XML::XElement(ns.w + "webHidden"), WebHidden) +
-					XML::WriteIf(XML::XElement(ns.w + "smallCaps", XML::XAttribute(ns.w + "val", SmallCaps)), SmallCaps.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "caps", XML::XAttribute(ns.w + "val", Caps)), Caps.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "emboss", XML::XAttribute(ns.w + "val", Emboss)), Emboss.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "imprint", XML::XAttribute(ns.w + "val", Imprint)), Imprint.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "outline", XML::XAttribute(ns.w + "val", Outline)), Outline.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "shadow", XML::XAttribute(ns.w + "val", Shadow)), Shadow.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "vanish", XML::XAttribute(ns.w + "val", Vanish)), Vanish.is_init()) +
-					XML::WriteIf(XML::XElement(ns.w + "webHidden", XML::XAttribute(ns.w + "val", WebHidden)), WebHidden.is_init()) +
-
-					XML::Write(ns.w + "sz", ns.w + "val", FontSize) +
-					XML::Write(ns.w + "szCs", ns.w + "val", FontSize) +
-					XML::Write(ns.w + "rStyle", ns.w + "val", RStyle) +
-					XML::Write(Lang) + 
-					XML::Write(rFonts) +
-					XML::WriteIf(XML::XElement(ns.w + "vertAlign", XML::XAttribute(ns.w + "val", Index)), Index.is_init() && (Index->isSub() || Index->isSuper())) +
-					XML::Write(ns.w + "color", ns.w + "val", FontColor) +
-					XML::Write(ns.w + "highlight", ns.w + "val", Highlight) +
-					//XML::Write(ns.w + "shd", ns.w + "fill", Background) +
-					XML::Write(Shading) +
-					XML::Write(ns.w + "spacing", ns.w + "val", Spacing) +
-					XML::Write(ns.w + "kern", ns.w + "val", Kern) +
-					XML::Write(ns.w + "position", ns.w + "val", Position) +
-					XML::Write(ns.w + "w", ns.w + "val", Scale) +
-					XML::Write(Border) +
-					XML::Write(PropertyChange)
-				);
+		return XML::XElement();
 		}
 
-
 		const bool RunProperty::isSimple() const
 		{
 			/*const bool bold		= Bold;

Common/ASCDocxFormat/Source/DocxFormat/Logic/RunPropertyChange.cpp

@@ -46,12 +46,7 @@ namespace OOX
 
 		const XML::XNode RunPropertyChange::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "rPrChange",
-				    XML::XAttribute(ns.w + "id", Id) +
-					XML::XAttribute(ns.w + "author", Author) +
-					XML::XAttribute(ns.w + "date", Date) 
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Sdt.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode Sdt::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "sdt",
-					XML::Write(Property) + 
-					XML::Write(EndProperty) + 
-					XML::Write(Content)
-				);
+		return XML::XElement();
 		}		
 	} // namespace Logic
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/SdtContent.cpp

@@ -36,7 +36,7 @@ namespace OOX
 
 		const XML::XNode SdtContent::toXML() const
 		{
-			return XML::XElement();//ns.w + "sdtContent", XML::Write(Items));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/SdtEndProperty.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode SdtEndProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "sdtEndPr",
-					XML::Write(RunProperty) +
-					XML::Write(ns.w + "id", ns.w + "val", Id) +
-					XML::WriteIf(XML::XElement(ns.w + "temporary"), Temporary) +
-					XML::WriteIf(XML::XElement(ns.w + "showingPlcHdr"), ShowingPlcHdr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/SdtProperty.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode SdtProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "sdtPr",
-					XML::Write(ns.w + "id", ns.w + "val", Id) + 
-					XML::Write(DocPartObj)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/SectorProperty.cpp

@@ -67,19 +67,7 @@ namespace OOX
 
 		const XML::XNode SectorProperty::toXML() const
 		{
-			return XML::XElement(ns.w + "sectPr",
-				XML::Write(FootNoteProperty) +
-				XML::Write(EndNoteProperty) +
-				XML::Write(PageSize) +
-				XML::Write(PageMargin) +
-				XML::Write(LnNumType) +
-				XML::Write(Columns) +
-				XML::Write(DocumentGrid)	+
-				XML::Write(Footers) +
-				XML::Write(Headers) +
-				XML::Write(PageBorders) +
-				XML::Write(ns.w + "type", ns.w + "val", Type) +
-				XML::WriteIf(XML::XElement(ns.w + "titlePg"), TitlePage));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Separator.cpp

@@ -41,7 +41,7 @@ namespace OOX
 
 		const XML::XNode Separator::toXML() const
 		{
-			return XML::XElement(ns.w + "separator");
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Shading.cpp

@@ -41,10 +41,7 @@ namespace OOX
 
 		const XML::XNode Shading::toXML() const
 		{
-			return XML::XElement(ns.w + "shd",
-				XML::XAttribute(ns.w + "val", value)	+
-				XML::XAttribute(ns.w + "color", color)	+
-				XML::XAttribute(ns.w + "fill", fill));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Shadow.cpp

@@ -51,18 +51,7 @@ namespace OOX
 		
 		const XML::XNode Shadow::toXML() const
 		{			
-			return
-				XML::XElement(ns.v + "shadow",
-					XML::XAttribute("on", On) +
-					XML::XAttribute("type", Type) +
-					XML::XAttribute("color", Color) +
-					XML::XAttribute("color2", Color2) +
-					XML::XAttribute("offset", Offset) +
-					XML::XAttribute("offset2", Offset2) +
-					XML::XAttribute("opacity", Opacity) +
-					XML::XAttribute("origin", Origin) +
-					XML::XAttribute("matrix", Matrix)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Shape.cpp

@@ -63,22 +63,7 @@ namespace OOX
 
 		const XML::XNode Shape::toXML() const
 		{			
-			return
-				XML::XElement(ns.v + "shape", 
-				XML::XAttribute("id", Id) +
-				XML::XAttribute("type", Type) +
-				XML::XAttribute("style", style.ToString()) +	
-				XML::XAttribute("adj", adj) +
-				XML::XAttribute("allowincell", AllowInCell) +
-				XML::XAttribute(ns.o + "ole", Ole) +
-				XML::XAttribute("coordsize", coordsize) +
-				XML::XAttribute("path", path) +
-				XML::Write(shadow) +
-				XML::Write(textbox) +
-				XML::Write(imageData) +
-				XML::Write(TextPath) +
-				XML::Write(Wrap) +
-				XML::Write(Extrusion));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/ShapeType.cpp

@@ -52,25 +52,8 @@ namespace OOX
 		}
 
 		const XML::XNode ShapeType::toXML() const
-		{			
-			return
-				XML::XElement(ns.v + "shapetype",
-				XML::XAttribute("id", Id) +
-				XML::XAttribute("coordsize", coordsize) +
-				XML::XAttribute(ns.o + "spt", Spt) +
-				XML::XAttribute(ns.o + "preferrelative", Preferrelative) +
-				XML::XAttribute("adj", adj) +
-				XML::XAttribute("path", path) +
-				XML::XAttribute("filled", Filled) +
-				XML::XAttribute("stroked", Stroked) +
-				XML::Write(Stroke) +
-				XML::Write(formulas) +
-				XML::Write(PathElement) +
-				XML::Write(TextPath) +
-				XML::Write(Handles) +
-				XML::Write(Lock) +										
-				XML::Write(Complex)
-				);
+		{		
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Spacing.cpp

@@ -67,17 +67,7 @@ namespace OOX
 
 		const XML::XNode Spacing::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "spacing", 
-					XML::XAttribute(ns.w + "after", After) +									
-					XML::XAttribute(ns.w + "afterAutospacing", AfterAutospacing) +
-					XML::XAttribute(ns.w + "afterLines", AfterLines) +
-					XML::XAttribute(ns.w + "before", Before) +
-					XML::XAttribute(ns.w + "beforeAutospacing", BeforeAutospacing) +	
-					XML::XAttribute(ns.w + "beforeLines", BeforeLines) +
-					XML::XAttribute(ns.w + "line", Line) +
-					XML::XAttribute(ns.w + "lineRule", LineRule) 
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/Stroke.cpp

@@ -41,7 +41,7 @@ namespace OOX
 
 		const XML::XNode Stroke::toXML() const
 		{			
-			return XML::XElement(ns.v + "stroke", XML::XAttribute("joinstyle", Join) + XML::XAttribute("dashstyle", DashStyle) + XML::XAttribute("endcap", EndCap));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Symbol.cpp

@@ -63,11 +63,7 @@ namespace OOX
 
 		const XML::XNode Symbol::toXML() const
 		{
-		  return
-		    XML::XElement(ns.w + "sym",
-			   	          XML::XAttribute(ns.w + "font", Font) +
-				          XML::XAttribute(ns.w + "char", Char)
-			);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/TCMar.cpp

@@ -42,12 +42,7 @@ namespace OOX
 
 		const XML::XNode TCMar::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tcMar",
-				XML::Write(Top) +
-				XML::Write(Left) +
-				XML::Write(Bottom) +
-				XML::Write(Right));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Tab.cpp

@@ -59,7 +59,7 @@ namespace OOX
 
 		const XML::XNode Tab::toXML() const
 		{
-			return XML::XElement(ns.w + "tab");
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/TabProperty.cpp

@@ -51,12 +51,7 @@ namespace OOX
 
 		const XML::XNode TabProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tab",
-					XML::XAttribute(ns.w + "val", Val) +
-					XML::XAttribute(ns.w + "leader", Leader) +
-					XML::XAttribute(ns.w + "pos", Pos)
-				);
+		return XML::XElement();
 		}
 	} // namespace Logic
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Logic/Table.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode Table::toXML() const
 		{
-			return XML::XElement(ns.w + "tbl",	XML::Write(tblPr) +	XML::Write(tblGrid) + XML::Write(Rows));
+		return XML::XElement();
 		}
 
 		void Table::SetCountsVMerged()

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableBorders.cpp

@@ -44,13 +44,7 @@ namespace OOX
 
 		const XML::XNode TableBorders::toXML() const
 		{
-			return XML::XElement(ns.w + "tblBorders", 
-				XML::Write(top) +
-				XML::Write(bottom) +
-				XML::Write(left) +
-				XML::Write(right) +
-				XML::Write(insideV) +
-				XML::Write(insideH));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCell.cpp

@@ -43,12 +43,7 @@ namespace OOX
 
 		const XML::XNode TableCell::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tc",
-					XML::Write(Properties) + 
-					XML::Write(Items) +
-					XML::WriteIf(XML::XElement(ns.w + "p"), !hasParagraph())
-				);
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCellBorders.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode TableCellBorders::toXML() const
 		{
-			return XML::XElement(ns.w + "tcBorders",
-				XML::Write(top) +
-				XML::Write(bottom) +
-				XML::Write(left) +
-				XML::Write(right));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCellMar.cpp

@@ -46,13 +46,7 @@ namespace OOX
 	
 		const XML::XNode TableCellMar::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tblCellMar",
-					XML::Write(Top) +
-					XML::Write(Left) +
-					XML::Write(Bottom) +
-					XML::Write(Right)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCellMargin.cpp

@@ -52,11 +52,7 @@ namespace OOX
 
 		const XML::XNode TableCellMargin::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + Name.ToString(),
-					XML::XAttribute(ns.w + "w", Margin->W) +
-					XML::XAttribute(ns.w + "type", Margin->Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCellProperties.cpp

@@ -47,15 +47,7 @@ namespace OOX
 
 		const XML::XNode TableCellProperties::toXML() const
 		{
-			return	XML::XElement(ns.w + "tcPr", 
-				XML::Write(Width) +
-				XML::Write(tblBorders) +
-				XML::Write(CellMar) +
-				XML::Write(VMerge) +
-				//XML::Write(ns.w + "shd", ns.w + "fill", Background) +
-				XML::Write(Shading) +
-				XML::Write(ns.w + "gridSpan", ns.w + "val", GridSpan) + 
-				XML::Write(ns.w + "vAlign", ns.w + "val", VAlign));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableCellWidth.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode TableCellWidth::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tcW",
-					XML::XAttribute(ns.w + "w", Width) + 
-					XML::XAttribute(ns.w + "type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableGrid.cpp

@@ -38,7 +38,7 @@ namespace OOX
 
 		const XML::XNode TableGrid::toXML() const
 		{
-			return XML::XElement(ns.w + "tblGrid", XML::Write(Columns));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableInd.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode TableInd::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tblInd", 
-					XML::XAttribute(ns.w + "w", Width) + 
-					XML::XAttribute(ns.w + "type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableProperty.cpp

@@ -86,14 +86,7 @@ namespace OOX
 
 		const XML::XNode TableProperty::toXML() const
 		{
-			return XML::XElement(ns.w + "tblPr",
-				XML::Write(ns.w + "tblStyle", ns.w + "val", Style) + 
-				XML::Write(Width) + 
-				XML::Write(ns.w + "tblLayout", ns.w + "type", Layout) +
-				XML::Write(ns.w + "tblLook", ns.w + "val", Look) +
-				XML::Write(Ind) +
-				XML::Write(CellMar) +
-				XML::Write(tblBorders));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableRow.cpp

@@ -76,7 +76,7 @@ namespace OOX
 
 		const XML::XNode TableRow::toXML() const
 		{
-			return XML::XElement(ns.w + "tr", XML::Write(Properties) + XML::Write(Cells));
+		return XML::XElement();
 		}
 
 		const TableCell TableRow::getCellByNumCol(const int num) const

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableRowHeight.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode TableRowHeight::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "trHeight",
-					XML::XAttribute(ns.w + "val", Height) + 
-					XML::XAttribute(ns.w + "hRule", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableRowProperties.cpp

@@ -44,10 +44,7 @@ namespace OOX
 
 		const XML::XNode TableRowProperties::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "trPr", 
-					XML::Write(Height)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableStyleProperties.cpp

@@ -44,13 +44,7 @@ namespace OOX
 
 		const XML::XNode TableStyleProperties::toXML() const
 		{
-			return XML::XElement(ns.w + "tblStylePr",
-				XML::XAttribute(ns.w + "type", Type) +
-				XML::Write(ParagraphProperty) +
-				XML::Write(RunProperty) +
-				XML::Write(TableProperty) +
-				XML::Write(TableRowProperties) +
-				XML::Write(tcPr));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TableWidth.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode TableWidth::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "tblW",
-					XML::XAttribute(ns.w + "w", Width) + 
-					XML::XAttribute(ns.w + "type", Type)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TabsProperty.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode TabsProperty::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "tabs",
-					XML::Write(Tabs)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Text.cpp

@@ -62,9 +62,7 @@ namespace OOX
 
 		const XML::XNode Text::toXML() const
 		{
-			XML::XElement element = XML::XElement(ns.w + "t", XML::XText(m_text));
-			element.Space = true;
-			return element;
+		return XML::XElement();
 		}
 
 

Common/ASCDocxFormat/Source/DocxFormat/Logic/TextBox.cpp

@@ -40,8 +40,8 @@ namespace OOX
 		}
 
 		const XML::XNode TextBox::toXML() const
-		{			
-			return XML::XElement(ns.v + "textbox", XML::XAttribute("style", style) + XML::XAttribute("inset", inset) + XML::Write(content));
+		{	
+		return XML::XElement();
 		}
 	} // namespace Logic
 } // namespace OOX

Common/ASCDocxFormat/Source/DocxFormat/Logic/TextBoxContent.cpp

@@ -46,7 +46,9 @@ namespace OOX
 
 		const XML::XNode TextBoxContent::toXML() const
 		{			
-			return XML::XElement(ns.w + "txbxContent", XML::Write(items));
+			return XML::XElement();
+
+			//return XML::XElement(ns.w + "txbxContent", XML::Write(items));
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TextFrameProperties.cpp

@@ -77,18 +77,7 @@ namespace OOX
 
 		const XML::XNode TextFrameProperties::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "framePr",
-					XML::XAttribute(ns.w + "hAnchor", HAnchor) +
-					XML::XAttribute(ns.w + "vAnchor", VAnchor) +
-					XML::XAttribute(ns.w + "wrap", Wrap) +
-				    XML::XAttribute(ns.w + "x", X) +
-					XML::XAttribute(ns.w + "y", Y) +
-					XML::XAttribute(ns.w + "h", H) +
-					XML::XAttribute(ns.w + "w", W) +
-					XML::XAttribute(ns.w + "hSpace", HSpace) +
-					XML::XAttribute(ns.w + "vSpace", VSpace)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/TextPath.cpp

@@ -48,15 +48,7 @@ namespace OOX
 		
 		const XML::XNode TextPath::toXML() const
 		{			
-			return
-				XML::XElement(ns.v + "textpath",
-					XML::XAttribute("style", Style) +
-					XML::XAttribute("on", On) +
-					XML::XAttribute("fitshape", FitShape) +
-					XML::XAttribute("trim", Trim) +
-					XML::XAttribute("fitpath", FitPath) +
-					XML::XAttribute("string", String)					
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/VMerge.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode VMerge::toXML() const
 		{
-			return XML::XElement(ns.w + "vMerge", XML::XAttribute(ns.w + "val", Value));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/Wrap.cpp

@@ -41,10 +41,7 @@ namespace OOX
 
 		const XML::XNode Wrap::toXML() const
 		{
-		    return XML::XElement(ns.w10 + "wrap", 
-			            XML::XAttribute("type", Type) +
-						XML::XAttribute("anchorx", AnchorX) +
-						XML::XAttribute("anchory", AnchorY));
+		return XML::XElement();
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Logic/WrapPath.cpp

@@ -46,11 +46,13 @@ namespace OOX
 
 		const XML::XNode WrapPath::toXML() const
 		{
-			return XML::XElement(ns.wp + "wrapPolygon",
-				XML::XAttribute("edited", edited) +
-				XML::Write(start) +
-				XML::Write(points)
-				);
+			return XML::XElement();
+
+			//return XML::XElement(ns.wp + "wrapPolygon",
+			//	XML::XAttribute("edited", edited) +
+			//	XML::Write(start) +
+			//	XML::Write(points)
+			//	);
 		}
 
 	} // namespace Logic

Common/ASCDocxFormat/Source/DocxFormat/Settings/ClrSchemeMapping.cpp

@@ -55,21 +55,7 @@ namespace OOX
 
 		const XML::XNode ClrSchemeMapping::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "clrSchemeMapping",
-					XML::XAttribute(ns.w + "bg1", m_bg1) +
-					XML::XAttribute(ns.w + "t1", m_t1) +
-					XML::XAttribute(ns.w + "bg2", m_bg2) +
-					XML::XAttribute(ns.w + "t2", m_t2) +
-					XML::XAttribute(ns.w + "accent1", m_accent1) +
-					XML::XAttribute(ns.w + "accent2", m_accent2) +
-					XML::XAttribute(ns.w + "accent3", m_accent3) +
-					XML::XAttribute(ns.w + "accent4", m_accent4) +
-					XML::XAttribute(ns.w + "accent5", m_accent5) +
-					XML::XAttribute(ns.w + "accent6", m_accent6) +
-					XML::XAttribute(ns.w + "hyperlink", m_hyperlink) +
-					XML::XAttribute(ns.w + "followedHyperlink", m_followedHyperlink)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Endnote.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode Endnote::toXML() const
 		{
-			return XML::XElement(ns.w + "endnote", XML::XAttribute(ns.w + "id", m_id));
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/EndnotePr.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode EndnotePr::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "endnotePr",
-					XML::Write(m_endnotes)					
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Footnote.cpp

@@ -43,7 +43,7 @@ namespace OOX
 
 		const XML::XNode Footnote::toXML() const
 		{
-			return XML::XElement(ns.w + "footnote", XML::XAttribute(ns.w + "id", m_id));
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/FootnotePr.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode FootnotePr::toXML() const
 		{
-			return 
-				XML::XElement(ns.m + "footnotePr",
-					XML::Write(m_footnotes)					
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/HdrShapeDefaults.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode HdrShapeDefaults::toXML() const
 		{
-			return 
-				XML::XElement(ns.m + "hdrShapeDefaults",
-					XML::Write(m_shapeDefault)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/IdMap.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode IdMap::toXML() const
 		{
-			return
-				XML::XElement(ns.o + "idmap", 
-					XML::XAttribute(ns.v + "ext", m_ext) + 
-					XML::XAttribute("data", m_data)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/MathPr.cpp

@@ -54,20 +54,7 @@ namespace OOX
 
 		const XML::XNode MathPr::toXML() const
 		{
-			return 
-				XML::XElement(ns.m + "mathPr",
-					XML::XElement(ns.m + "mathFont", XML::XAttribute(ns.m + "val", m_mathFont)) +
-					XML::XElement(ns.m + "brkBin", XML::XAttribute(ns.m + "val", m_brkBin)) +
-					XML::XElement(ns.m + "brkBinSub", XML::XAttribute(ns.m + "val", m_brkBinSub)) +
-					XML::XElement(ns.m + "smallFrac", XML::XAttribute(ns.m + "val", m_smallFrac)) + 
-					XML::XElement(ns.m + "dispDef", XML::XAttribute(ns.m + "val", m_dispDef)) +
-					XML::XElement(ns.m + "lMargin", XML::XAttribute(ns.m + "val", m_lMargin)) +
-					XML::XElement(ns.m + "rMargin", XML::XAttribute(ns.m + "val", m_rMargin)) +
-					XML::XElement(ns.m + "defJc", XML::XAttribute(ns.m + "val", m_defJc)) +
-					XML::XElement(ns.m + "wrapIndent", XML::XAttribute(ns.m + "val", m_wrapIndent)) + 
-					XML::XElement(ns.m + "intLim", XML::XAttribute(ns.m + "val", m_intLim)) +
-					XML::XElement(ns.m + "naryLim", XML::XAttribute(ns.m + "val", m_naryLim))
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/ProofState.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode ProofState::toXML() const
 		{
-			return
-				XML::XElement(ns.w + "proofState", 
-					XML::XAttribute(ns.w + "spelling", m_spelling) + 
-					XML::XAttribute(ns.w + "grammar", m_grammar)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Rule.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode Rule::toXML() const
 		{
-			return 
-				XML::XElement(ns.o + "r",
-					XML::XAttribute("id", m_id) +
-					XML::XAttribute("type", m_type) +
-					XML::XAttribute("idref", m_idref)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Rules.cpp

@@ -45,11 +45,7 @@ namespace OOX
 
 		const XML::XNode Rules::toXML() const
 		{
-			return 
-				XML::XElement(ns.o + "rules",
-					XML::XAttribute(ns.v + "ext", m_ext) +
-					XML::Write(m_rules)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/ShapeDefaults.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode ShapeDefaults::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "shapeDefaults",
-					XML::Write(m_shapeDefault) +					
-					XML::Write(m_shapeLayout)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Shapedefault.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode ShapeDefault::toXML() const
 		{
-			return 
-				XML::XElement(ns.o + "shapedefaults",
-					XML::XAttribute(ns.v + "ext", m_ext) +
-					XML::XAttribute("spidmax", m_spidmax)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Shapelayout.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode ShapeLayout::toXML() const
 		{
-			return 
-				XML::XElement(ns.o + "shapelayout",
-					XML::XAttribute(ns.v + "ext", m_ext) +
-					XML::Write(m_idMap) +
-					XML::Write(m_rules)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Settings/Zoom.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode Zoom::toXML() const
 		{
-			return 
-				XML::XElement(ns.w + "zoom", 
-					XML::XAttribute(ns.w + "val", m_value) +
-					XML::XAttribute(ns.w + "percent", m_percent)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Settings

Common/ASCDocxFormat/Source/DocxFormat/Styles.cpp

@@ -25,7 +25,7 @@ namespace OOX
 
 	void Styles::read(const OOX::CPath& filename)
 	{
-		const XML::XDocument document(filename.GetPath());
+		const XML::XDocument document(filename);
 		
 		Default	=	document.Root.element("docDefaults");
 		Lattent	=	document.Root.element("latentStyles");

Common/ASCDocxFormat/Source/DocxFormat/Styles/DocDefaults.cpp

@@ -43,13 +43,7 @@ namespace OOX
 
 	const XML::XNode Styles::DocDefaults::toXML() const
 	{
-		return
-			XML::XElement(ns.w + "docDefaults",
-				XML::XElement(ns.w + "rPrDefault",
-					XML::Write(RunProperty)) +
-				XML::XElement(ns.w + "pPrDefault", 
-					XML::Write(ParagraphProperty))
-			);
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Styles/LattentStyles.cpp

@@ -47,16 +47,7 @@ namespace OOX
 
 	const XML::XNode Styles::LattentStyles::toXML() const
 	{
-		return 
-			XML::XElement(ns.w + "latentStyles",
-				XML::XAttribute(ns.w + "defLockedState", DefLockedState) +
-				XML::XAttribute(ns.w + "defUIPriority", DefUIPriority) +
-				XML::XAttribute(ns.w + "defSemiHidden", DefSemiHidden) +
-				XML::XAttribute(ns.w + "defUnhideWhenUsed", DefUnhideWhenUsed) +
-				XML::XAttribute(ns.w + "defQFormat", DefQFormat) + 
-				XML::XAttribute(ns.w + "count", Count) +
-				XML::Write(LsdExceptions)
-			);
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Styles/LsdException.cpp

@@ -45,14 +45,7 @@ namespace OOX
 
 	const XML::XNode Styles::LsdException::toXML() const
 	{
-		return 
-			XML::XElement(ns.w + "lsdException",
-				XML::XAttribute(ns.w + "name", Name) + 
-				XML::XAttribute(ns.w + "semiHidden", SemiHidden) +
-				XML::XAttribute(ns.w + "uiPriority", UiPriority) +
-				XML::XAttribute(ns.w + "unhideWhenUsed", UnhideWhenUsed) + 
-				XML::XAttribute(ns.w + "qFormat", QFormat)
-			);
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Styles/Style.cpp

@@ -54,26 +54,7 @@ namespace OOX
 
 	const XML::XNode Styles::Style::toXML() const
 	{
-		return 
-			XML::XElement(ns.w + "style",
-				XML::XAttribute(ns.w + "type", Type) +
-				XML::XAttribute(ns.w + "default", Default) +
-				XML::XAttribute(ns.w + "customStyle", CustomStyle) +
-				XML::XAttribute(ns.w + "styleId", StyleId) +			
-				XML::Write(ns.w + "name", ns.w + "val", name) +
-				XML::WriteIf(XML::XElement(ns.w + "semiHidden"), SemiHidden) +
-				XML::WriteIf(XML::XElement(ns.w + "unhideWhenUsed"), UnhideWhenUsed) +					
-				XML::WriteIf(XML::XElement(ns.w + "qFormat"), QFormat) +
-				XML::WriteIf(XML::XElement(ns.w + "autoRedefine"), AutoRedefine) +
-				XML::Write(ns.w + "basedOn", ns.w + "val", BasedOn) +
-				XML::Write(ns.w + "next", ns.w + "val", Next) +
-				XML::Write(ns.w + "link", ns.w + "val", Link) +
-				XML::Write(ns.w + "uiPriority", ns.w + "val", UiPriority) +
-				XML::Write(ParagraphProperty) +
-				XML::Write(RunProperty) +
-				XML::Write(tblPr) +
-				XML::Write(tcPr) +
-				XML::Write(tableStyles));
+		return XML::XElement();
 	}
 
 } // namespace OOX
\ No newline at end of file

Common/ASCDocxFormat/Source/DocxFormat/Theme/BevelT.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode BevelT::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "bevelT", 
-					XML::XAttribute("w", m_w) + 
-					XML::XAttribute("h", m_h)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/BgFillStyleLst.cpp

@@ -44,11 +44,7 @@ namespace OOX
 	
 		const XML::XNode BgFillStyleLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "bgFillStyleLst",
-					XML::Write(m_solidFill)	 + 
-					XML::Write(m_gradFills)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Camera.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode Camera::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "camera ",
-					XML::XAttribute("prst", m_prst) +
-					XML::Write(m_rot)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/ClrScheme.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode ClrScheme::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "clrScheme", 
-					XML::XAttribute("name", name) + 
-					XML::Write(clrSchemeItems)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/ClrSchemeItem.cpp

@@ -53,8 +53,7 @@ namespace OOX
 
 		const XML::XNode ClrSchemeItem::toXML() const
 		{
-			return XML::XElement();
-			//return XML::XElement(ns.a + *name, XML::Write(*item));
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/EffectLst.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode EffectLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "effectLst", 
-					XML::Write(m_outerShdw) +
-					XML::Write(m_scene3d) +
-					XML::Write(m_sp3d)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/EffectStyle.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode EffectStyle::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "effectStyle", 
-					XML::Write(m_effestLst) +
-					XML::Write(m_scene3d) +
-					XML::Write(m_sp3d)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/EffectStyleLst.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode EffectStyleLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "effectStyleLst", 
-					XML::Write(m_effectStyles)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/ExtraClrSchemeLst.cpp

@@ -41,8 +41,7 @@ namespace OOX
 
 		const XML::XNode ExtraClrSchemeLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "extraClrSchemeLst");
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/File.cpp

@@ -30,7 +30,8 @@ namespace OOX
 
 		void File::read(const OOX::CPath& filename)
 		{
-			const XML::XDocument document(filename.GetPath());
+			const XML::XDocument document(filename);
+		
 			name = document.Root.attribute("name").value();
 			themeElements			= document.Root.element("themeElements");
 			objectDefaults		= document.Root.element("objectDefaults");

Common/ASCDocxFormat/Source/DocxFormat/Theme/FillStyleLst.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode FillStyleLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "fillStyleLst",
-					XML::Write(m_solidFill) +
-					XML::Write(m_gradFills)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/FillToRect.cpp

@@ -46,13 +46,8 @@ namespace OOX
 
 		const XML::XNode FillToRect::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "fillToRect",
-					XML::XAttribute("l", m_l) + 
-					XML::XAttribute("t", m_t) + 
-					XML::XAttribute("r", m_r) + 
-					XML::XAttribute("b", m_b)
-				);
+		return XML::XElement();
+
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/FmtScheme.cpp

@@ -47,14 +47,7 @@ namespace OOX
 
 		const XML::XNode FmtScheme::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "fmtScheme",
-					XML::XAttribute("name", name) +
-					XML::Write(fillStyleLst) +
-					XML::Write(lnStyleLst) +
-					XML::Write(effectStyleLst) +
-					XML::Write(bgFillStyleLst)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Font.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode Font::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "font", 
-					XML::XAttribute("script", m_script) + 
-					XML::XAttribute("typeface", m_typeface)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/FontScheme.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode FontScheme::toXML() const
 		{	
-			return 
-				XML::XElement(ns.a + "fontScheme", 
-					XML::XAttribute("name", name) +
-					XML::Write(majorFont) + 
-					XML::Write(minorFont)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/GradFill.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode GradFill::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "gradFill", 
-					XML::XAttribute("rotWithShape", m_rotWithShape) + 
-					XML::Write(m_gsLst) +
-					XML::Write(m_lin) +
-					XML::Write(m_path)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Gs.cpp

@@ -44,11 +44,7 @@ namespace OOX
 	
 		const XML::XNode Gs::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "gs",
-					XML::XAttribute("pos", m_pos) + 
-					XML::Write(m_schemeClr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/GsLst.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode GsLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "gsLst", 
-					XML::Write(m_gss)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/LightRig.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode LightRig::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "lightRig",
-					XML::XAttribute("rig", m_rig) +
-					XML::XAttribute("dir", m_dir) +
-					XML::Write(m_rot)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Lin.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode Lin::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "lin",
-					XML::XAttribute("ang", m_ang) +
-					XML::XAttribute("scaled", m_scaled)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Ln.cpp

@@ -48,15 +48,7 @@ namespace OOX
 
 		const XML::XNode Ln::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "ln", 
-					XML::XAttribute("w", m_w) +
-					XML::XAttribute("cap", m_cap) +
-					XML::XAttribute("cmpd", m_cmpd) +
-					XML::XAttribute("algn", m_algn) +
-					XML::Write(m_solidFill) +
-					XML::Write(ns.a + "prstDash", "val", m_prstDash)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/LnStyleLst.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode LnStyleLst::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "lnStyleLst", 
-					XML::Write(m_lns)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/MajorFont.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode MajorFont::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "majorFont",
-					XML::XElement(ns.a + "latin", XML::XAttribute("typeface", latin)) +
-					XML::XElement(ns.a + "ea", XML::XAttribute("typeface", ea)) +
-					XML::XElement(ns.a + "cs", XML::XAttribute("typeface", cs)) +
-					XML::Write(fonts)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/MinorFont.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode MinorFont::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "minorFont",
-					XML::XElement(ns.a + "latin", XML::XAttribute("typeface", latin)) +
-					XML::XElement(ns.a + "ea", XML::XAttribute("typeface", ea)) +
-					XML::XElement(ns.a + "cs", XML::XAttribute("typeface", cs)) +
-					XML::Write(fonts)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/ObjectDefaults.cpp

@@ -41,8 +41,7 @@ namespace OOX
 
 		const XML::XNode ObjectDefaults::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "objectDefaults");
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/OuterShdw.cpp

@@ -48,14 +48,7 @@ namespace OOX
 
 		const XML::XNode OuterShdw::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "outerShdw",
-					XML::XAttribute("blurRad", m_blurRad) +
-					XML::XAttribute("dist", m_dist) + 
-					XML::XAttribute("dir", m_dir) +
-					XML::XAttribute("rotWithShape", m_rotWithShare) +
-					XML::Write(m_srgbClr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Path.cpp

@@ -46,11 +46,7 @@ namespace OOX
 
 		const XML::XNode Path::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "path", 
-					XML::XAttribute("path", m_path) +
-					XML::Write(m_fillToRect)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Rot.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode Rot::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "rot", 
-					XML::XAttribute("lat", m_lat) +
-					XML::XAttribute("lon", m_lon) + 
-					XML::XAttribute("rev", m_rev)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Scene3d.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode Scene3d::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "scene3d", 
-					XML::Write(m_camera) + 
-					XML::Write(m_lightRig)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/SchemeClr.cpp

@@ -46,13 +46,7 @@ namespace OOX
 
 		const XML::XNode SchemeClr::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "schemeClr",
-					XML::XAttribute("val", m_value) +
-					XML::Write(ns.a + "tint", "val", m_tint) +
-					XML::Write(ns.a + "shade", "val", m_shade) +
-					XML::Write(ns.a + "satMod", "val", m_satMod)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/SolidFill.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode SolidFill::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "solidFill", 
-					XML::Write(m_schemeClr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/Sp3d.cpp

@@ -43,10 +43,7 @@ namespace OOX
 
 		const XML::XNode Sp3d::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "sp3d", 
-					XML::Write(m_bevelT)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/SrgbClr.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode SrgbClr::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "srgbClr", 
-					XML::XAttribute("val", m_value) +
-					XML::Write(ns.a + "alpha", "val", m_alpha)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/SysClr.cpp

@@ -44,11 +44,7 @@ namespace OOX
 
 		const XML::XNode SysClr::toXML() const
 		{
-			return 
-				XML::XElement(ns.a + "sysClr", 
-					XML::XAttribute("val", m_value) + 
-					XML::XAttribute("lastClr", m_lastClr)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/Theme/ThemeElements.cpp

@@ -45,12 +45,7 @@ namespace OOX
 
 		const XML::XNode ThemeElements::toXML() const
 		{
-			return
-				XML::XElement(ns.a + "themeElements",
-					XML::Write(clrScheme) +
-					XML::Write(fontScheme) +
-					XML::Write(fmtScheme)
-				);
+		return XML::XElement();
 		}
 
 	} // namespace Theme

Common/ASCDocxFormat/Source/DocxFormat/WritingVector.h

@@ -33,7 +33,8 @@ namespace OOX
 
 		virtual const XML::XNode toXML() const 
 		{
-			return XML::Write(m_items);
+			return XML::XElement();//
+			//return XML::Write(m_items);
 		}
 	};
 } // namespace OOX

Common/ASCDocxFormat/Source/XML/Exception/Base.h

@@ -5,15 +5,14 @@
 #include "Exception/log_invalid_argument.h"
 #include <string>
 
-
 namespace XML
 {
 	namespace Exception
 	{
 		class Base : public log_invalid_argument
 		{
-			public:
-				Base(const std::string& message);
+		public:
+			Base(const std::string& message);
 		};
 	} // namespace Exception
 } // namespace XML

Common/ASCDocxFormat/Source/XML/Extension/Fill.h

@@ -6,12 +6,9 @@
 #include "./../XElement.h"
 #include "./../Private/XElementContainer.h"
 
-
 namespace XML
 {
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element)
+	template<class T> void Fill(T& container, const XML::XElement& element)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -21,8 +18,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -32,8 +28,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -46,8 +41,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -60,8 +54,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -75,8 +68,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -90,8 +82,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -105,8 +96,7 @@ namespace XML
 	}
 
 
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -119,9 +109,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -134,9 +122,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -149,9 +135,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -164,9 +148,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -179,9 +161,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -194,9 +174,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -209,9 +187,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -224,9 +200,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -239,9 +213,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -254,9 +226,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -269,9 +239,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -284,9 +252,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -299,9 +265,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9, const std::string& name10)
+	template<class T> void Fill(T& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9, const std::string& name10)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{
@@ -314,9 +278,7 @@ namespace XML
 		}
 	}
 
-
-	template<class T>
-	void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9, const std::string& name10)
+	template<class T> void Fill(property<T>& container, const XML::XElement& element, const std::string& name1, const std::string& name2, const std::string& name3, const std::string& name4, const std::string& name5, const std::string& name6, const std::string& name7, const std::string& name8, const std::string& name9, const std::string& name10)
 	{
 		for (Private::XElementContainer::const_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
 		{

Common/ASCDocxFormat/Source/XML/Extension/FillFromAttribute.h

-#pragma once
-#ifndef XML_FILL_FROM_ATTRIBUTE_INCLUDE_H_
-#define XML_FILL_FROM_ATTRIBUTE_INCLUDE_H_
-
-#include "property.h"
-#include "./../XML.h"
-#include <boost/call_traits.hpp>
-
-
-namespace XML
-{
-	template<class T, typename V>
-	void FillFromAttribute(T& container, const XML::XElement& element, const XML::XName& xname, typename boost::call_traits<V>::param_type value)
-	{
-		for (XML::const_element_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
-		{
-			XElement element(*i);
-			if (element.attribute(xname).exist() && element.attribute(name).value() == value)
-			{
-				container.push_back(T::value_type(XElement(*i)));
-				container.back().this_is_not_xobject_class();
-			}
-		}
-	}
-
-
-	template<class T, typename V>
-	void FillFromAttribute(property<T>& container, const XML::XElement& element, const XML::XName& xname, typename boost::call_traits<V>::param_type value)
-	{
-		for (XML::const_element_iterator i = element.Elements.begin(); i != element.Elements.end(); ++i)
-		{
-			XElement element(*i);
-			if (element.attribute(name).exist() && element.attribute(name).value() == value)
-			{
-				container.push_back(T::value_type(XElement(*i)));
-				container.back().this_is_not_xobject_class();
-			}
-		}
-	}
-} // namespace XML
-
-#endif // XML_FILL_FROM_ATTRIBUTE_INCLUDE_H_
\ No newline at end of file

Common/ASCDocxFormat/Source/XML/Extension/Write.cpp

-
-// auto inserted precompiled begin
-#include "precompiled_xml.h"
-// auto inserted precompiled end
-
-#include "Write.h"
-#include "./../XObject.h"
-#include "./../XElement.h"
-
-
-namespace XML
-{
-	const XNode Write(const XObject& object)
-	{
-		return object.toXML();
-	}
-}
\ No newline at end of file

Common/ASCDocxFormat/Source/XML/Extension/Write.h

-#pragma once
-#ifndef XML_EXTENSION_WRITE_INCLUDE_H_
-#define XML_EXTENSION_WRITE_INCLUDE_H_
-
-#include "nullable.h"
-#include "property.h"
-#include "nullable_property.h"
-#include <boost/shared_ptr.hpp>
-#include "./../XNode.h"
-#include "./../XName.h"
-#include <boost/call_traits.hpp>
-#include <boost/foreach.hpp>
-
-
-namespace XML
-{
-	class XObject;
-
-	const XNode Write(const XObject& object);
-
-	template<class O, typename T>
-	const XNode Write(const O& object, const T& value)
-	{
-		return object.toXML(value);
-	}
-
-
-	template<class T>
-	const XNode Write(const nullable__<T>& object)
-	{
-		if (object.is_init())
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML();
-		}
-		return XNode();
-	}
-
-
-	template<class T, class S, class G>
-	const XNode Write(const property<T, S, G>& object)
-	{
-		object->this_is_not_xobject_class();
-		return object->toXML();
-	}
-
-
-	template<class T, class S, class G, typename V>
-	const XNode Write(const property<T, S, G>& object, const V& value)
-	{
-		object->this_is_not_xobject_class();
-		return object->toXML(value);
-	}
-
-
-	template<class T, class S, class G>
-	const XNode Write(const nullable_property<T, S, G>& object)
-	{
-		if (object.is_init())
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML();
-		}
-		return XNode();
-	}
-
-
-	template<class T, class S, class G, typename V>
-	const XNode Write(const nullable_property<T, G, S>& object, const V& value)
-	{
-		if (object.is_init())
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML(value);
-		}
-		return XNode();
-	}
-
-
-	template<class T>
-	const XNode Write(T* object)
-	{
-		if (object != 0)
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML();
-		}
-		return XNode();
-	}
-
-
-	template<class T, typename V>
-	const XNode Write(T* object, const V& value)
-	{
-		if (object != 0)
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML(value);
-		}
-		return XNode();
-	}
-
-
-	template<class T>
-	const XNode Write(const boost::shared_ptr<T>& object)
-	{
-		if (object != 0)
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML();
-		}
-		return XNode();
-	}
-
-
-	template<class T, typename V>
-	const XNode Write(const boost::shared_ptr<T>& object, const V& value)
-	{
-		if (object != 0)
-		{
-			object->this_is_not_xobject_class();
-			return object->toXML(value);
-		}
-		return XNode();
-	}
-
-
-	template<template<typename T, class A> class C, typename T, class A>
-	const XNode Write(const C<T, A>& container)
-	{
-		return XContainer(container);
-	}
-
-
-	template<template<typename T, class A> class C, typename T, class A, typename V>
-	const XNode Write(const C<T, A>& container, const V& value)
-	{
-		XContainer xcontainer;
-		BOOST_FOREACH(const T& object, container)
-		{
-			xcontainer.Add(object.toXML(value));
-		}
-		return xcontainer;
-	}
-
-
-	template<template<typename T, class A> class C, typename T, class A>
-	const XNode Write(const property<C<T, A> >& container)
-	{
-		return XContainer(container);
-	}
-
-
-	template<template<typename T, class A> class C, typename T, class A, typename V>
-	const XNode Write(const property<C<T, A> >& container, const V& value)
-	{
-		XContainer xcontainer;
-		BOOST_FOREACH(const T& object, *container)
-		{
-			xcontainer.Add(object.toXML(value));
-		}
-		return xcontainer;
-	}
-
-
-	template<typename T>
-	const XML::XNode Write(const XML::XName& element, const XML::XName& attribute, const T& value)
-	{
-		return XML::XElement(element, XML::XAttribute(attribute, value));
-	}
-
-
-	template<typename T>
-	const XML::XNode Write(const XML::XName& element, const XML::XName& attribute, const nullable__<T>& value)
-	{
-		if (value.is_init())
-			return XML::XElement(element, XML::XAttribute(attribute, *value));
-		return XML::XNode();
-	}
-
-
-	template<typename T, class S, class G>
-	const XML::XNode Write(const XML::XName& element, const XML::XName& attribute, const property<T, S, G>& value)
-	{
-		return XML::XElement(element, XML::XAttribute(attribute, value));
-	}
-
-
-	template<typename T, class S, class G>
-	const XML::XNode Write(const XML::XName& element, const XML::XName& attribute, const nullable_property<T, S, G>& value)
-	{
-		if (value.is_init())
-			return XML::XElement(element, XML::XAttribute(attribute, value));
-		return XML::XNode();
-	}
-
-} // namespace XML
-
-#endif // XMK_EXTENSION_WRITE_INCLUDE_H_
\ No newline at end of file

Common/ASCDocxFormat/Source/XML/Extension/WriteIf.cpp

-
-// auto inserted precompiled begin
-#include "precompiled_xml.h"
-// auto inserted precompiled end
-
-#include "WriteIf.h"
-
-
-namespace XML
-{
-
-	const XML::XNode WriteIf(const XName& xname, const bool write)
-	{
-		if (write)
-			return XML::XElement(xname);
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XName& xname, const nullable__<bool> write)
-	{
-		if (write.get_value_or(false))
-			return XML::XElement(xname);
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XName& xname, const property<bool> write)
-	{
-		if (write)
-			return XML::XElement(xname);
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XName& xname, const nullable_property<bool> write)
-	{
-		if (write.get_value_or(false))
-			return XML::XElement(xname);
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XElement& element, const bool write)
-	{
-		if (write)
-			return element;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XElement& element, const nullable__<bool> write)
-	{
-		if (write.get_value_or(false))
-			return element;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XElement& element, const property<bool> write)
-	{
-		if (write)
-			return element;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XElement& element, const nullable_property<bool> write)
-	{
-		if (write.get_value_or(false))
-			return element;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XNode& node, const bool write)
-	{
-		if (write)
-			return node;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XNode& node, const nullable__<bool> write)
-	{
-		if (write.get_value_or(write))
-			return node;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XNode& node, const property<bool> write)
-	{
-		if (write)
-			return node;
-		return XML::XNode();
-	}
-
-
-	const XML::XNode WriteIf(const XML::XNode& node, const nullable_property<bool> write)
-	{
-		if (write.get_value_or(false))
-			return node;
-		return XML::XNode();
-	}
-
-
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const bool write)
-	{
-		if (write)
-			return attribute;
-		return XML::XAttribute();
-	}
-
-
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const nullable__<bool> write)
-	{
-		if (write.get_value_or(false))
-			return attribute;
-		return XML::XAttribute();
-	}
-
-
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const property<bool> write)
-	{
-		if (write)
-			return attribute;
-		return XML::XAttribute();
-	}
-
-
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const nullable_property<bool> write)
-	{
-		if (write.get_value_or(false))
-			return attribute;
-		return XML::XAttribute();
-	}
-
-} // namespace XML
\ No newline at end of file

Common/ASCDocxFormat/Source/XML/Extension/WriteIf.h

-#pragma once
-#ifndef XML_EXTENSION_WRITE_IF_INCLUDE_H_
-#define XML_EXTENSION_WRITE_IF_INCLUDE_H_
-
-#include "nullable.h"
-#include "property.h"
-#include "nullable_property.h"
-#include "./../XName.h"
-#include "./../XNode.h"
-#include "./../XElement.h"
-#include "./../XAttribute.h"
-
-
-namespace XML
-{
-	const XML::XNode WriteIf(const XName& xname, const bool write);
-	const XML::XNode WriteIf(const XName& xname, const nullable__<bool> write);
-	const XML::XNode WriteIf(const XName& xname, const property<bool> write);
-	const XML::XNode WriteIf(const XName& xname, const nullable_property<bool> write);
-
-	const XML::XNode WriteIf(const XML::XElement& element, const bool write);
-	const XML::XNode WriteIf(const XML::XElement& element, const nullable__<bool> write);
-	const XML::XNode WriteIf(const XML::XElement& element, const property<bool> write);
-	const XML::XNode WriteIf(const XML::XElement& element, const nullable_property<bool> write);
-
-	const XML::XNode WriteIf(const XML::XNode& node, const bool write);
-	const XML::XNode WriteIf(const XML::XNode& node, const nullable__<bool> write);
-	const XML::XNode WriteIf(const XML::XNode& node, const property<bool> write);
-	const XML::XNode WriteIf(const XML::XNode& node, const nullable_property<bool> write);
-
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const bool write);
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const nullable__<bool> write);
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const property<bool> write);
-	const XML::XAttribute WriteIf(const XML::XAttribute& attribute, const nullable_property<bool> write);
-} // namespace XML
-
-#endif // XML_EXTENSION_WRITE_IF_INCLUDE_H_
\ No newline at end of file

Common/ASCDocxFormat/Source/XML/Private/Element.cpp

@@ -4,10 +4,14 @@
 // auto inserted precompiled end
 
 #include "Element.h"
+
+#include <utility>
+#include <vector>
+
 #include "XList.h"
+
 #include "./../Exception/Parse.h"
 #include "./../Exception/Namespace.h"
-#include <utility>
 #include "Namespace.h"
 #include "./../XAttribute.h"
 #include "./../XAttribute.h"
@@ -15,12 +19,9 @@
 #include "./../XElement.h"
 #include "./../XText.h"
 #include "./../XContainer.h"
-#include <boost/foreach.hpp>
-#include <vector>
 #include "Exception/not_implement.h"
 #include "Utility.h"
 
-
 namespace XML
 {
 	namespace Private
@@ -120,24 +121,25 @@ namespace XML
 			}
 
 			typedef std::pair<std::pair<std::string, std::string>, std::string> attribute_type;
-			BOOST_FOREACH(const attribute_type& attribute, attributes)
+
+			for (std::list<attribute_type>::iterator iter = attributes.begin();	iter != attributes.end();++iter)
 			{
-				if (attribute.first.first.empty())
+				if ((*iter).first.first.empty())
 				{
-					Attributes.push_back(XAttribute(attribute.first.second, attribute.second));
+					Attributes.push_back(XAttribute((*iter).first.second, (*iter).second));
 				}
 				else
 				{
-					XNamespace thisNs = Namespaces[attribute.first.first];
-					XNamespace defineNs = defineNamespaces[attribute.first.first];
+					XNamespace thisNs = Namespaces[(*iter).first.first];
+					XNamespace defineNs = defineNamespaces[(*iter).first.first];
 
 					if (thisNs.exist())
-						Attributes.push_back(XAttribute(thisNs + attribute.first.second, attribute.second));
+						Attributes.push_back(XAttribute(thisNs + (*iter).first.second, (*iter).second));
 					else if (defineNs.exist())
-						Attributes.push_back(XAttribute(defineNs + attribute.first.second, attribute.second));
+						Attributes.push_back(XAttribute(defineNs + (*iter).first.second, (*iter).second));
 					else
 					{
-						//Attributes.push_back(XAttribute(attribute.first.second, attribute.second));
+						//Attributes.push_back(XAttribute((*iter).first.second, (*iter).second));
 						//throw Exception::Namespace("not define namespace");
 					}
 				}
@@ -214,21 +216,22 @@ namespace XML
 			}
 
 			typedef std::pair<std::pair<std::wstring, std::wstring>, std::wstring> attribute_type;
-			BOOST_FOREACH(const attribute_type& attribute, attributes)
+		
+			for (std::list<attribute_type >::iterator iter = attributes.begin(); iter != attributes.end(); ++iter)
 			{
-				if (attribute.first.first.empty())
+				if ((*iter).first.first.empty())
 				{
-					Attributes.push_back(XAttribute(Encoding::unicode2utf8(attribute.first.second), Encoding::unicode2utf8(attribute.second)));
+					Attributes.push_back(XAttribute(Encoding::unicode2utf8((*iter).first.second), Encoding::unicode2utf8((*iter).second)));
 				}
 				else
 				{
-					XNamespace thisNs = Namespaces[Encoding::unicode2utf8(attribute.first.first)];
-					XNamespace defineNs = defineNamespaces[Encoding::unicode2utf8(attribute.first.first)];
+					XNamespace thisNs = Namespaces[Encoding::unicode2utf8((*iter).first.first)];
+					XNamespace defineNs = defineNamespaces[Encoding::unicode2utf8((*iter).first.first)];
 
 					if (thisNs.exist())
-						Attributes.push_back(XAttribute(thisNs + Encoding::unicode2utf8(attribute.first.second), Encoding::unicode2utf8(attribute.second)));
+						Attributes.push_back(XAttribute(thisNs + Encoding::unicode2utf8((*iter).first.second), Encoding::unicode2utf8((*iter).second)));
 					else if (defineNs.exist())
-						Attributes.push_back(XAttribute(defineNs + Encoding::unicode2utf8(attribute.first.second), Encoding::unicode2utf8(attribute.second)));
+						Attributes.push_back(XAttribute(defineNs + Encoding::unicode2utf8((*iter).first.second), Encoding::unicode2utf8((*iter).second)));
 					else
 						throw Exception::Namespace("not define namespace");
 				}

Common/ASCDocxFormat/Source/XML/Private/Namespace.h

@@ -7,12 +7,11 @@
 #include "property.h"
 #include <list>
 
-
 namespace XML
 {
 	namespace Private
 	{
-		class Namespace : private boost::totally_ordered<Namespace>
+		class Namespace 
 		{
 		public:
 			Namespace(const std::string& prefix, const std::string& name);
@@ -25,10 +24,6 @@ namespace XML
 			const std::wstring ToWString() const;
 			virtual void SaveToStringList(std::list<std::string>& strList)const;
 			virtual void SaveToWStringList(std::list<std::wstring>& strList)const;
-
-		//public:
-			//property<std::string>	Prefix;
-			//property<std::string>	Name;
 		private:
 			std::string	Prefix;
 			std::string	Name;

Common/ASCDocxFormat/Source/XML/Private/NodeContainer.h

@@ -8,14 +8,11 @@
 #include "XElementContainer.h"
 #include "XTextContainer.h"
 #include "property.h"
-#include "./../Extension/Write.h"
 #include "XSpace.h"
-//#include "XSource.h"
 #include "XSingleSource.h"
 #include "XWideSource.h"
 #include <list>
 
-
 namespace XML
 {
 	class XElement;

Common/ASCDocxFormat/Source/XML/Private/XAttributeContainer.cpp

@@ -5,19 +5,15 @@
 
 #include "XAttributeContainer.h"
 #include "./../XName.h"
-#include <boost/foreach.hpp>
 #include <algorithm>
-#include <boost/bind.hpp>
 #include "NullXAttribute.h"
 
-
 namespace XML
 {
 	namespace Private
 	{
 		static NullXAttribute nullXAttribute;
 
-
 		const bool XAttributeContainer::exist(const XName& xname) const
 		{
 			for(const_iterator current = begin(); current != end(); current++)
@@ -34,7 +30,6 @@ namespace XML
 			return false;
 		}
 
-
 		XAttribute& XAttributeContainer::operator[] (const XName& xname)
 		{
 			for(iterator current = begin(); current != end(); current++)
@@ -50,7 +45,6 @@ namespace XML
 			return nullXAttribute;
 		}
 
-
 		const XAttribute& XAttributeContainer::operator[] (const XName& xname) const
 		{
 			for(const_iterator current = begin(); current != end(); current++)
@@ -66,7 +60,6 @@ namespace XML
 			return nullXAttribute;
 		}
 
-
 		const XNamespaceContainer XAttributeContainer::usedNamespace() const
 		{
 			XNamespaceContainer container;
@@ -80,25 +73,21 @@ namespace XML
 			return container;
 		}
 
-
 		XAttributeContainer::iterator XAttributeContainer:: begin()
 		{
 			return m_container.begin();
 		}
 
-
 		XAttributeContainer::iterator XAttributeContainer::end()
 		{
 			return m_container.end();
 		}
 
-
 		XAttributeContainer::const_iterator XAttributeContainer::begin() const
 		{
 			return m_container.begin();
 		}
 
-
 		XAttributeContainer::const_iterator XAttributeContainer::end() const
 		{
 			return m_container.end();

Common/ASCDocxFormat/Source/XML/Private/XContainer.h

@@ -2,7 +2,6 @@
 #ifndef XML_PRIVATE_XCONTAINER_INCLUDE_H_
 #define XML_PRIVATE_XCONTAINER_INCLUDE_H_
 
-#include <boost/foreach.hpp>
 #include <algorithm>
 #include <string>
 #include <list>
@@ -92,28 +91,26 @@ namespace XML
 		const std::string XContainer<T>::ToString() const
 		{
 			std::string result;
-			BOOST_FOREACH(const T& current, m_container)
+			for(std::list<T>::const_iterator current = m_container.begin(); current != m_container.end(); current++)
 			{
 				result += " ";
-				result += current->ToString();
+				result += (*current)->ToString();
 			}
 			return result;
 		}
 
-
 		template<class T>
 		const std::wstring XContainer<T>::ToWString() const
 		{
 			std::wstring result;
-			BOOST_FOREACH(const T& current, m_container)
+			for(std::list<T>::const_iterator current = m_container.begin(); current != m_container.end(); current++)
 			{
 				result += L" ";
-				result += current->ToWString();
+				result += (*current)->ToWString();
 			}
 			return result;
 		}
 
-
 		template<class T>
 		void XContainer<T>::SaveToStringList(std::list<std::string>& strList)const
 		{

Common/ASCDocxFormat/Source/XML/Private/XElementContainer.cpp

@@ -8,29 +8,23 @@
 #include "./../XNode.h"
 #include "./../XElement.h"
 #include "./../XName.h"
-#include <boost/foreach.hpp>
 #include "NullXElement.h"
 
-
 namespace XML
 {
 	namespace Private
 	{
 		static NullXElement nullXElement;
 
-
-		XElementContainer::XElementContainer(const XNodeContainer& nodes)
-			: m_container(nodes.container())
+		XElementContainer::XElementContainer(const XNodeContainer& nodes) : m_container(nodes.container())
 		{
 		}
 
-
 		const bool XElementContainer::empty() const
 		{
 			return size() == 0;
 		}
 
-
 		const size_t XElementContainer::size() const
 		{
 			size_t size = 0;
@@ -39,7 +33,6 @@ namespace XML
 			return size;
 		}
 
-
 		void XElementContainer::push_back(const XElement& element)
 		{
 			if (element.is_init() && element.exist())
@@ -48,13 +41,11 @@ namespace XML
 			}
 		}
 
-
 		void XElementContainer::Add(const XElement& element)
 		{
 			push_back(element);
 		}
 
-
 		const bool XElementContainer::exist(const XName& xname) const
 		{
 			//for (const_iterator i = begin(); i != end(); ++i)
@@ -70,7 +61,6 @@ namespace XML
 			return false;
 		}
 
-
 		XElement XElementContainer::operator[] (const XName& xname)
 		{
 			//for (iterator i = begin(); i != end(); ++i)
@@ -94,7 +84,6 @@ namespace XML
 			return nullXElement;
 		}
 
-
 		const XElement XElementContainer::operator[] (const XName& xname) const
 		{
 			//for (const_iterator i = begin(); i != end(); ++i)
@@ -120,7 +109,6 @@ namespace XML
 			return nullXElement;
 		}
 
-
 		XElement XElementContainer::get(const XName& xname, const std::string& value)
 		{
 			for (iterator i = begin(); i != end(); ++i)
@@ -132,7 +120,6 @@ namespace XML
 			return nullXElement;
 		}
 
-
 		const XElement XElementContainer::get(const XName& xname, const std::string& value) const
 		{
 			for (const_iterator i = begin(); i != end(); ++i)
@@ -144,31 +131,26 @@ namespace XML
 			return nullXElement;
 		}
 
-		
 		XElementContainer::iterator XElementContainer:: begin()
 		{
 			return iterator(m_container->begin(), m_container->end());
 		}
 
-
 		XElementContainer::iterator XElementContainer::end()
 		{
 			return iterator(m_container->end(), m_container->end());
 		}
 
-
 		XElementContainer::const_iterator XElementContainer::begin() const
 		{
 			return const_iterator(m_container->begin(), m_container->end());
 		}
 
-
 		XElementContainer::const_iterator XElementContainer::end() const
 		{
 			return const_iterator(m_container->end(), m_container->end());
 		}
 
-
 		const XNamespaceContainer XElementContainer::usedNamespace() const
 		{
 			XNamespaceContainer container;

Common/ASCDocxFormat/Source/XML/Private/XFileSource.cpp

@@ -11,16 +11,8 @@ namespace XML
 {
 	namespace Private
 	{
-
-		XFileSource::XFileSource(const boost::filesystem::path& path)
-			: m_stream(path.string().c_str())
-		{
-			setBegin();
-		}
-
-
-		XFileSource::XFileSource(const boost::filesystem::wpath& path)
-			: m_stream(path.string().c_str())
+		XFileSource::XFileSource(const OOX::CPath& path)
+			: m_stream(path.GetPath())
 		{
 			setBegin();
 		}

Common/ASCDocxFormat/Source/XML/Private/XFileSource.h

@@ -3,10 +3,10 @@
 #define XML_PRIVATE_XFILE_SOURCE_INCLUDE_H_
 
 #include "XSingleSource.h"
-#include <boost/filesystem.hpp>
 #include <fstream>
 #include <iterator>
 
+#include "../../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 
 namespace XML
 {
@@ -15,8 +15,7 @@ namespace XML
 		class XFileSource : public XSingleSource
 		{
 		public:
-			XFileSource(const boost::filesystem::path& path);
-			XFileSource(const boost::filesystem::wpath& path);
+			XFileSource(const OOX::CPath& path);
 			virtual ~XFileSource();
 
 		private:

Common/ASCDocxFormat/Source/XML/Private/XNamespaceContainer.cpp

@@ -13,44 +13,40 @@ namespace XML
 	{
 		static NullXNamespace nullXNamespace;
 
-
 		const bool XNamespaceContainer::exist(const std::string& name) const
 		{
-			BOOST_FOREACH(const XNamespace& current, m_container)
+			for (std::list<XNamespace>::const_iterator current = m_container.begin(); current != m_container.end(); ++current)
 			{
-				if (current->GetPrefix() == name)
+				if ((*current)->GetPrefix() == name)
 					return true;
 			}
+		
 			return false;
 		}
 
-
-
 		XNamespace& XNamespaceContainer::operator[] (const std::string& name)
 		{
-			BOOST_FOREACH(XNamespace& current, m_container)
+			for (std::list<XNamespace>::iterator current = m_container.begin(); current != m_container.end(); ++current)
 			{
-				if (current->GetPrefix() == name)
-					return current;
+				if ((*current)->GetPrefix() == name)
+					return (*current);
 			}
 			return nullXNamespace;
 		}
 
-
 		const XNamespace& XNamespaceContainer::operator[] (const std::string& name) const
 		{
-			BOOST_FOREACH(const XNamespace& current, m_container)
+			for (std::list<XNamespace>::const_iterator current = m_container.begin(); current != m_container.end(); ++current)
 			{
-				if (current->GetPrefix() == name)
-					return current;
+				if ((*current)->GetPrefix() == name)
+					return (*current);
 			}
+		
 			return nullXNamespace;
 		}
 
-
 		void XNamespaceContainer::erase(const std::string& name)
 		{
-			//for (std::set<XNamespace>::iterator i = m_container.begin(); i != m_container.end(); ++i)
 			for (std::list<XNamespace>::iterator i = m_container.begin(); i != m_container.end(); ++i)
 			{
 				if ((*i)->GetPrefix() == name)
@@ -61,34 +57,29 @@ namespace XML
 			}
 		}
 
-
 		void XNamespaceContainer::erase(const XNamespaceContainer& rhs)
 		{
-			BOOST_FOREACH(const XNamespace& current, rhs.m_container)
+			for (std::list<XNamespace>::iterator current = m_container.begin(); current != m_container.end(); ++current)
 			{
-				erase(current->GetPrefix());
+				erase((*current)->GetPrefix());
 			}
 		}
 
-
 		XNamespaceContainer::iterator XNamespaceContainer:: begin()
 		{
 			return m_container.begin();
 		}
 
-
 		XNamespaceContainer::iterator XNamespaceContainer::end()
 		{
 			return m_container.end();
 		}
 
-
 		XNamespaceContainer::const_iterator XNamespaceContainer::begin() const
 		{
 			return m_container.begin();
 		}
 
-
 		XNamespaceContainer::const_iterator XNamespaceContainer::end() const
 		{
 			return m_container.end();

Common/ASCDocxFormat/Source/XML/Private/XNodeContainer.cpp

@@ -5,41 +5,33 @@
 
 #include "XNodeContainer.h"
 #include <algorithm>
-#include <boost/bind.hpp>
 #include <numeric>
 #include "./../XNode.h"
 #include "./../XContainer.h"
 
-
 namespace XML
 {
 	namespace Private
 	{
-
-		XNodeContainer::XNodeContainer()
-			: m_container(new std::list<XNode>())
+		XNodeContainer::XNodeContainer() : m_container(new std::list<XNode>())
 		{
 		}
 
-
 		const bool XNodeContainer::empty() const
 		{
 			return m_container->empty();
 		}
 
-
 		const size_t XNodeContainer::size() const
 		{
 			return m_container->size();
 		}
 
-
 		void XNodeContainer::Add(const XNode& node)
 		{
 			push_back(node);
 		}
 
-
 		void XNodeContainer::push_back(const XNode& node)
 		{
 			if (node.is_init())
@@ -51,28 +43,24 @@ namespace XML
 			}
 		}
 
-
 		void XNodeContainer::merge(const XNodeContainer& other)
 		{
 			for(std::list<XNode>::const_iterator current = other.m_container->begin(); current != other.m_container->end(); current++)
 				push_back(*current);
 		}
 
-
 		const std::string XNodeContainer::ToString() const
 		{
-			return std::accumulate(m_container->begin(), m_container->end(), std::string(),
-						boost::bind(std::plus<std::string>(), _1, boost::bind(&XNode::ToString, _2)));
+			// TODO: if need
+			return std::string();
 		}
 
-
 		const std::wstring XNodeContainer::ToWString() const
 		{
-			return std::accumulate(m_container->begin(), m_container->end(), std::wstring(),
-						boost::bind(std::plus<std::wstring>(), _1, boost::bind(&XNode::ToWString, _2)));
+			// TODO: if need
+			return std::wstring();
 		}
 
-
 		void XNodeContainer::SaveToStringList(std::list<std::string>& strList)const
 		{
 			for(std::list<XNode>::const_iterator iter = m_container->begin(); iter != m_container->end(); iter++)
@@ -81,7 +69,6 @@ namespace XML
 			}
 		}
 
-
 		void XNodeContainer::SaveToWStringList(std::list<std::wstring>& strList)const
 		{
 			for(std::list<XNode>::const_iterator iter = m_container->begin(); iter != m_container->end(); iter++)
@@ -90,7 +77,6 @@ namespace XML
 			}
 		}
 
-
 		const boost::shared_ptr<std::list<XNode> >	XNodeContainer::container() const
 		{
 			return m_container;

Common/ASCDocxFormat/Source/XML/Private/XString.cpp

@@ -4,10 +4,8 @@
 // auto inserted precompiled end
 
 #include "XString.h"
-#include <boost/lexical_cast.hpp>
 #include "Encoding.h"
 
-
 namespace XML
 {
 	namespace Private
@@ -131,19 +129,6 @@ namespace XML
 			return Encoding::utf82unicode(m_value.get_value_or_default());
 		}
 
-
-		const boost::filesystem::path XString::ToPath() const
-		{
-			return m_value.get_value_or_default();
-		}
-
-
-		const boost::filesystem::wpath XString::ToWPath() const
-		{
-			return Encoding::utf82unicode(m_value.get_value_or_default());
-		}
-
-
 		XString::operator const bool() const
 		{
 			return ToBool();

Common/ASCDocxFormat/Source/XML/Private/XString.h

@@ -4,12 +4,12 @@
 
 #include <boost/operators.hpp>
 #include <string>
-#include <boost/filesystem.hpp>
 #include "nullable.h"
 #include "property.h"
 #include "nullable_property.h"
 #include "Parse.h"
 
+#include "../../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 
 namespace XML
 {
@@ -37,8 +37,6 @@ namespace XML
 			const double ToDouble() const;
 			const std::string ToString() const;
 			const std::wstring ToWString() const;
-			const boost::filesystem::path ToPath() const;
-			const boost::filesystem::wpath ToWPath() const;
 
 			operator const bool() const;
 			operator const int() const;

Common/ASCDocxFormat/Source/XML/Private/XWFileSource.cpp

@@ -11,17 +11,8 @@ namespace XML
 {
 	namespace Private
 	{
-
-		XWFileSource::XWFileSource(const boost::filesystem::path& path, XWideSource::eSourceType type)
-			: m_stream(path.string().c_str())
-			, XWideSource(type)
-		{
-			setBegin();
-		}
-
-
-		XWFileSource::XWFileSource(const boost::filesystem::wpath& path, XWideSource::eSourceType type)
-			: m_stream(path.string().c_str())
+		XWFileSource::XWFileSource(const OOX::CPath& path, XWideSource::eSourceType type)
+			: m_stream(path.GetPath())
 			, XWideSource(type)
 		{
 			setBegin();

Common/ASCDocxFormat/Source/XML/Private/XWFileSource.h

@@ -3,10 +3,10 @@
 #define XML_PRIVATE_XWFILE_SOURCE_INCLUDE_H_
 
 #include "XWideSource.h"
-#include <boost/filesystem.hpp>
 #include <fstream>
 #include <iterator>
 
+#include "../../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 
 namespace XML
 {
@@ -15,8 +15,7 @@ namespace XML
 		class XWFileSource : public XWideSource
 		{
 		public:
-			XWFileSource(const boost::filesystem::path& path, XWideSource::eSourceType type);
-			XWFileSource(const boost::filesystem::wpath& path, XWideSource::eSourceType type);
+			XWFileSource(const OOX::CPath& path, XWideSource::eSourceType type);
 			virtual ~XWFileSource();
 
 		private:

Common/ASCDocxFormat/Source/XML/XDocument.cpp

@@ -21,33 +21,10 @@ namespace XML
 	{
 	}
 
-
-	XDocument::XDocument(const char* source, const bool space)
-	{
-		boost::filesystem::wpath path(Encoding::utf82unicode(std::string(source)));
-		TxtFile text(CString(path.string().c_str()));
-		if(text.isUnicode())
-		{
-			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(path, Private::XWideSource::estLittleEndian));
-			Load(xsource, space);
-		}
-		else if((text.isBigEndian()) || (text.isUnicodeWithOutBOM()))
-		{
-			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(path, Private::XWideSource::estBigEndian));
-			Load(xsource, space);
-		}
-		else
-		{
-			boost::shared_ptr<Private::XSingleSource> xsource(new Private::XFileSource(path));
-			Load(xsource, space);
-		}
-	}
-
-
 	XDocument::XDocument(const wchar_t* source, const bool space)
 	{
-		boost::filesystem::wpath path(source);
-		TxtFile text(CString(path.string().c_str()));
+		OOX::CPath path(source);
+		TxtFile text(path);
 		if(text.isUnicode())
 		{
 			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(path, Private::XWideSource::estLittleEndian));
@@ -79,32 +56,9 @@ namespace XML
 		Load(xsource, space);
 	}
 
-
-	XDocument::XDocument(const boost::filesystem::path& source, const bool space)
-	{
-		boost::filesystem::wpath path(Encoding::utf82unicode(source.string()));
-		TxtFile text(CString(path.string().c_str()));
-		if(text.isUnicode())
-		{
-			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(source, Private::XWideSource::estLittleEndian));
-			Load(xsource, space);
-		}
-		else if((text.isBigEndian()) || (text.isUnicodeWithOutBOM()))
-		{
-			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(source, Private::XWideSource::estBigEndian));
-			Load(xsource, space);
-		}
-		else
-		{
-			boost::shared_ptr<Private::XSingleSource> xsource(new Private::XFileSource(path));
-			Load(xsource, space);
-		}
-	}
-
-
-	XDocument::XDocument(const boost::filesystem::wpath& source, const bool space)
+	XDocument::XDocument(const OOX::CPath& source, const bool space)
 	{
-		TxtFile text(CString(source.string().c_str()));
+		TxtFile text(source);
 		if(text.isUnicode())
 		{
 			boost::shared_ptr<Private::XWideSource> xsource(new Private::XWFileSource(source, Private::XWideSource::estLittleEndian));
@@ -198,21 +152,9 @@ namespace XML
 		Root->fromSource(source, Root->Namespaces, space);
 	}
 
-
-	void XDocument::Save(const boost::filesystem::path& path)
-	{
-		std::ofstream file(path.string().c_str());
-		if (!file.bad())
-		{
-			file << ToString();
-			file.close();
-		}
-	}
-
-
-	void XDocument::Save(const boost::filesystem::wpath& path)
+	void XDocument::Save(const OOX::CPath& path)
 	{
-		std::ofstream file(path.string().c_str());
+		std::ofstream file(path.GetPath());
 		if (!file.bad())
 		{
 			file << ToString();

Common/ASCDocxFormat/Source/XML/XDocument.h

@@ -5,12 +5,11 @@
 #include "property.h"
 #include "XElement.h"
 #include "Private/XDeclaration.h"
-#include <boost/filesystem.hpp>
-//#include "Private/XSource.h"
 #include "Private/XSingleSource.h"
 #include "Private/XWideSource.h"
 #include <boost/shared_ptr.hpp>
 
+#include "../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 
 namespace XML
 {
@@ -18,12 +17,10 @@ namespace XML
 	{
 	public:
 		explicit XDocument(const XElement& element);
-		explicit XDocument(const char* source, const bool space = false);
 		explicit XDocument(const wchar_t* source, const bool space = false);
 		explicit XDocument(const std::string& source, const bool space = false);
 		explicit XDocument(const std::wstring& source, const bool space = false);
-		explicit XDocument(const boost::filesystem::path& source, const bool space = false);
-		explicit XDocument(const boost::filesystem::wpath& source, const bool space = false);
+		explicit XDocument(const OOX::CPath& source, const bool space = false);
 
 	public:
 		XDocument const* const	operator->() const	{return this;}
@@ -34,8 +31,7 @@ namespace XML
 		const std::wstring ToWString();
 	
 	public:
-		void Save(const boost::filesystem::path& path);
-		void Save(const boost::filesystem::wpath& path);
+		void Save(const OOX::CPath& path);
 		void Save(std::string& source);
 		void Save(std::wstring& source);
 

Common/ASCDocxFormat/Source/XML/XElement.cpp

@@ -127,14 +127,7 @@ namespace XML
 	{
 	}
 
-
-	void XElement::Save(const boost::filesystem::path& path) const
-	{
-		XDocument(*this).Save(path);
-	}
-
-
-	void XElement::Save(const boost::filesystem::wpath& path) const
+	void XElement::Save(const OOX::CPath& path) const
 	{
 		XDocument(*this).Save(path);
 	}

Common/ASCDocxFormat/Source/XML/XElement.h

@@ -12,8 +12,6 @@
 #include "Private/XString.h"
 #include "Private/XNamespaceContainer.h"
 #include "Private/XSpace.h"
-#include <boost/filesystem.hpp>
-//#include "Private/XSource.h"
 #include "Private/XSingleSource.h"
 #include "Private/XWideSource.h"
 #include <list>
@@ -79,8 +77,7 @@ namespace XML
 		XElement*							operator->()				{return this;}
 
 	public:
-		void Save(const boost::filesystem::path& path) const;
-		void Save(const boost::filesystem::wpath& path) const;
+		void Save(const OOX::CPath& path) const;
 
 	public:
 		void fromSource(boost::shared_ptr<Private::XSingleSource> source, const Private::XNamespaceContainer& ns, const Private::XSpace& space);

Common/ASCDocxFormat/Source/XML/XML.h

@@ -10,10 +10,7 @@
 #include "XNode.h"
 #include "XDocument.h"
 #include "Private/XList.h"
-#include "Extension/Write.h"
-#include "Extension/WriteIf.h"
 #include "Extension/Fill.h"
-#include "Extension/FillFromAttribute.h"
 #include "XObject.h"
 #include "XComment.h"
 

Common/ASCDocxFormat/Source/XML/XName.h

@@ -9,10 +9,9 @@
 #include "nullable_property.h"
 #include "XNamespace.h"
 
-
 namespace XML
 {
-	class XName : private boost::equality_comparable<XName>
+	class XName
 	{
 	public:
 		XName();

Common/ASCDocxFormat/Source/XML/precompiled_xml.h

@@ -11,9 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/operators.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/call_traits.hpp>
-#include <boost/foreach.hpp>
 
 #include "setter.h"
 #include "getter.h"