Commit 2f99fb0d authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander Trofimov

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

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52931 954022d7-b5bf-4e40-9824-e11837661b57
parent 9ea51f56
...@@ -258,42 +258,6 @@ ...@@ -258,42 +258,6 @@
RelativePath="..\Source\XML\Extension\Fill.h" RelativePath="..\Source\XML\Extension\Fill.h"
> >
</File> </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>
<Filter <Filter
Name="Limit" Name="Limit"
......
...@@ -29,7 +29,7 @@ namespace OOX ...@@ -29,7 +29,7 @@ namespace OOX
{ {
IFileContainer::read(filename); IFileContainer::read(filename);
const XML::XDocument document(filename.GetPath()); const XML::XDocument document(filename);
const XML::XElement element = document.Root.element("body"); const XML::XElement element = document.Root.element("body");
SectorProperty = element.element("sectPr"); SectorProperty = element.element("sectPr");
Background = document.Root.element("background"); Background = document.Root.element("background");
......
...@@ -28,7 +28,7 @@ namespace OOX ...@@ -28,7 +28,7 @@ namespace OOX
{ {
IFileContainer::read(filename); IFileContainer::read(filename);
const XML::XDocument document(filename.GetPath()); const XML::XDocument document(filename);
XML::Fill(Notes, document.Root, "endnote"); XML::Fill(Notes, document.Root, "endnote");
} }
......
...@@ -37,13 +37,15 @@ namespace OOX ...@@ -37,13 +37,15 @@ namespace OOX
const XML::XNode EndNote::Note::toXML() const const XML::XNode EndNote::Note::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "endnote",
XML::XAttribute(ns.w + "type", Type) + //return
XML::XAttribute(ns.w + "id", Id) + // XML::XElement(ns.w + "endnote",
XML::Write(Items) // XML::XAttribute(ns.w + "type", Type) +
); // XML::XAttribute(ns.w + "id", Id) +
// XML::Write(Items)
// );
} }
......
...@@ -28,7 +28,7 @@ namespace OOX ...@@ -28,7 +28,7 @@ namespace OOX
{ {
IFileContainer::read(filename); IFileContainer::read(filename);
const XML::XDocument document(filename.GetPath()); const XML::XDocument document(filename);
XML::Fill(Notes, document.Root, "footnote"); XML::Fill(Notes, document.Root, "footnote");
} }
......
...@@ -36,12 +36,14 @@ namespace OOX ...@@ -36,12 +36,14 @@ namespace OOX
const XML::XNode FootNote::Note::toXML() const const XML::XNode FootNote::Note::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "footnote",
XML::XAttribute(ns.w + "type", Type) + //return
XML::XAttribute(ns.w + "id", Id) + // XML::XElement(ns.w + "footnote",
XML::Write(Items) // 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) void FootNote::Note::push_back(const OOX::Logic::Paragraph& paragraph)
......
...@@ -53,7 +53,7 @@ namespace OOX ...@@ -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"); XML::Fill(m_items, document.Root, "p", "tbl", "sdt");
} }
......
...@@ -53,7 +53,7 @@ namespace OOX ...@@ -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"); XML::Fill(m_items, document.Root, "p", "tbl", "sdt");
} }
......
...@@ -28,7 +28,7 @@ namespace OOX ...@@ -28,7 +28,7 @@ namespace OOX
void Item::read(const OOX::CPath& filename) void Item::read(const OOX::CPath& filename)
{ {
const XML::XDocument document(filename.GetPath()); const XML::XDocument document(filename);
SelectedStyle = document.Root.attribute("SelectedStyle").value(); SelectedStyle = document.Root.attribute("SelectedStyle").value();
StyleName = document.Root.attribute("StyleName").value(); StyleName = document.Root.attribute("StyleName").value();
} }
......
...@@ -28,7 +28,7 @@ namespace OOX ...@@ -28,7 +28,7 @@ namespace OOX
void ItemProps::read(const OOX::CPath& filename) void ItemProps::read(const OOX::CPath& filename)
{ {
const XML::XDocument document(filename.GetPath()); const XML::XDocument document(filename);
//Refs = document.Root.element("schemaRefs"); //Refs = document.Root.element("schemaRefs");
ItemID = document.Root.attribute("itemID").value(); ItemID = document.Root.attribute("itemID").value();
} }
......
...@@ -41,10 +41,7 @@ namespace OOX ...@@ -41,10 +41,7 @@ namespace OOX
const XML::XNode ItemProps::SchemaRef::toXML() const const XML::XNode ItemProps::SchemaRef::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.ds + "schemaRef",
XML::XAttribute(ns.ds + "uri", Uri)
);
} }
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -41,7 +41,7 @@ namespace OOX ...@@ -41,7 +41,7 @@ namespace OOX
const XML::XNode ItemProps::SchemaRefs::toXML() const const XML::XNode ItemProps::SchemaRefs::toXML() const
{ {
return XML::XElement(ns.ds + "schemaRefs", XML::Write(SchemaRef)); return XML::XElement();
} }
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -45,12 +45,7 @@ namespace OOX ...@@ -45,12 +45,7 @@ namespace OOX
const XML::XNode Background::toXML() const const XML::XNode Background::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "background",
XML::XAttribute(ns.w + "color", Color) +
XML::XAttribute(ns.w + "themeColor", ThemeColor) +
XML::XAttribute(ns.w + "themeShade", ThemeShade)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,10 +43,7 @@ namespace OOX ...@@ -43,10 +43,7 @@ namespace OOX
const XML::XNode BookmarkEnd::toXML() const const XML::XNode BookmarkEnd::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "bookmarkEnd",
XML::XAttribute(ns.w + "id", Id)
);
} }
......
...@@ -55,7 +55,7 @@ namespace OOX ...@@ -55,7 +55,7 @@ namespace OOX
const XML::XNode BookmarkEndParagraph::toXML() const 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 const std::string BookmarkEndParagraph::toTxt() const
......
...@@ -58,11 +58,7 @@ namespace OOX ...@@ -58,11 +58,7 @@ namespace OOX
const XML::XNode BookmarkStart::toXML() const const XML::XNode BookmarkStart::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "bookmarkStart",
XML::XAttribute(ns.w + "id", Id) +
XML::XAttribute(ns.w + "name", Name)
);
} }
......
...@@ -60,11 +60,7 @@ namespace OOX ...@@ -60,11 +60,7 @@ namespace OOX
const XML::XNode BookmarkStartParagraph::toXML() const const XML::XNode BookmarkStartParagraph::toXML() const
{ {
return XML::XElement(); return XML::XElement();
//XML::XElement(ns.w + "bookmarkStart",
// XML::XAttribute(ns.w + "id", Id) +
// XML::XAttribute(ns.w + "name", Name)
//);
} }
const std::string BookmarkStartParagraph::toTxt() const const std::string BookmarkStartParagraph::toTxt() const
......
...@@ -58,14 +58,7 @@ namespace OOX ...@@ -58,14 +58,7 @@ namespace OOX
const XML::XNode Border::toXML() const const XML::XNode Border::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -48,15 +48,7 @@ namespace OOX ...@@ -48,15 +48,7 @@ namespace OOX
const XML::XNode Bottom::toXML() const const XML::XNode Bottom::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
...@@ -63,11 +63,7 @@ namespace OOX ...@@ -63,11 +63,7 @@ namespace OOX
const XML::XNode Break::toXML() const const XML::XNode Break::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "br",
XML::XAttribute(ns.w + "type", Type) +
XML::XAttribute(ns.w + "clear", Clear)
);
} }
......
...@@ -52,11 +52,7 @@ namespace OOX ...@@ -52,11 +52,7 @@ namespace OOX
const XML::XNode Column::toXML() const const XML::XNode Column::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "col",
XML::XAttribute(ns.w + "w", Width) +
XML::XAttribute(ns.w + "space", Space)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -51,14 +51,7 @@ namespace OOX ...@@ -51,14 +51,7 @@ namespace OOX
const XML::XNode Columns::toXML() const const XML::XNode Columns::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode Complex::toXML() const const XML::XNode Complex::toXML() const
{ {
return XML::XElement(ns.o + "complex", XML::XAttribute(ns.v + "ext", Ext)); return XML::XElement();
} }
} // namespace Logic } // namespace Logic
......
...@@ -41,7 +41,7 @@ namespace OOX ...@@ -41,7 +41,7 @@ namespace OOX
const XML::XNode ContinuationSeparator::toXML() const const XML::XNode ContinuationSeparator::toXML() const
{ {
return XML::XElement(ns.w + "continuationSeparator"); return XML::XElement();
} }
......
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode DelText::toXML() const const XML::XNode DelText::toXML() const
{ {
return XML::XElement(ns.w + "delText", XML::XText(Text)); return XML::XElement();
} }
......
...@@ -48,13 +48,7 @@ namespace OOX ...@@ -48,13 +48,7 @@ namespace OOX
const XML::XNode Delete::toXML() const const XML::XNode Delete::toXML() const
{ {
return return XML::XElement();
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)
);
} }
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode DocPartObj::toXML() const const XML::XNode DocPartObj::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "docPartObj",
XML::Write(ns.w + "docPartGallery", ns.w + "val", Gallery) +
XML::WriteIf(XML::XElement(ns.w + "docPartUnique"), Unique)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -45,12 +45,7 @@ namespace OOX ...@@ -45,12 +45,7 @@ namespace OOX
const XML::XNode DocPr::toXML() const const XML::XNode DocPr::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.wp + "docPr",
XML::XAttribute("id", Id) +
XML::XAttribute("name", Name) +
XML::XAttribute("descr", Descr)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -45,12 +45,7 @@ namespace OOX ...@@ -45,12 +45,7 @@ namespace OOX
const XML::XNode DocumentGrid::toXML() const const XML::XNode DocumentGrid::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "docGrid",
XML::XAttribute(ns.w + "linePitch", LinePitch) +
XML::XAttribute(ns.w + "charSpace", CharSpace) +
XML::XAttribute(ns.w + "type", Type)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -174,7 +174,7 @@ namespace OOX ...@@ -174,7 +174,7 @@ namespace OOX
const XML::XNode Drawing::toXML() const const XML::XNode Drawing::toXML() const
{ {
return XML::XElement(ns.w + "drawing", XML::Write(Inline)); return XML::XElement();
} }
const std::string Drawing::toTxt() const const std::string Drawing::toTxt() const
......
...@@ -70,45 +70,46 @@ namespace OOX ...@@ -70,45 +70,46 @@ namespace OOX
const XML::XNode DrawingWrap::toXML() const const XML::XNode DrawingWrap::toXML() const
{ {
if (*Type == "wrapSquare") return XML::XElement();//
{ //if (*Type == "wrapSquare")
return XML::XElement(ns.wp + "wrapSquare", //{
XML::XAttribute("wrapText", TextWrap) + // return XML::XElement(ns.wp + "wrapSquare",
XML::XAttribute("distT", DistT) + // XML::XAttribute("wrapText", TextWrap) +
XML::XAttribute("distB", DistB) + // XML::XAttribute("distT", DistT) +
XML::XAttribute("distL", DistL) + // XML::XAttribute("distB", DistB) +
XML::XAttribute("distR", DistR) + // XML::XAttribute("distL", DistL) +
XML::Write(EffectExtent) // XML::XAttribute("distR", DistR) +
); // XML::Write(EffectExtent)
} // );
else if (*Type == "wrapTopAndBottom") //}
{ //else if (*Type == "wrapTopAndBottom")
return XML::XElement(ns.wp + "wrapTopAndBottom", //{
XML::XAttribute("distT", DistT) + // return XML::XElement(ns.wp + "wrapTopAndBottom",
XML::XAttribute("distB", DistB) + // XML::XAttribute("distT", DistT) +
XML::Write(EffectExtent) // XML::XAttribute("distB", DistB) +
); // XML::Write(EffectExtent)
} // );
else if (*Type == "wrapTight") //}
{ //else if (*Type == "wrapTight")
return XML::XElement(ns.wp + "wrapTight", //{
XML::XAttribute("wrapText", TextWrap) + // return XML::XElement(ns.wp + "wrapTight",
XML::XAttribute("distL", DistL) + // XML::XAttribute("wrapText", TextWrap) +
XML::XAttribute("distR", DistR) + // XML::XAttribute("distL", DistL) +
XML::Write(WrapPath) // XML::XAttribute("distR", DistR) +
); // XML::Write(WrapPath)
} // );
else if (*Type == "wrapThrough") //}
{ //else if (*Type == "wrapThrough")
return XML::XElement(ns.wp + "wrapThrough", //{
XML::XAttribute("wrapText", TextWrap) + // return XML::XElement(ns.wp + "wrapThrough",
XML::XAttribute("distL", DistL) + // XML::XAttribute("wrapText", TextWrap) +
XML::XAttribute("distR", DistR) + // XML::XAttribute("distL", DistL) +
XML::Write(WrapPath) // XML::XAttribute("distR", DistR) +
); // XML::Write(WrapPath)
} // );
//}
return XML::XElement(ns.wp + "wrapNone"); //return XML::XElement(ns.wp + "wrapNone");
} }
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -46,13 +46,7 @@ namespace OOX ...@@ -46,13 +46,7 @@ namespace OOX
const XML::XNode EffectExtent::toXML() const const XML::XNode EffectExtent::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.wp + "effectExtent",
XML::XAttribute("l", Left) +
XML::XAttribute("t", Top) +
XML::XAttribute("r", Right) +
XML::XAttribute("b", Bottom)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -51,11 +51,7 @@ namespace OOX ...@@ -51,11 +51,7 @@ namespace OOX
const XML::XNode EndNoteProperty::toXML() const const XML::XNode EndNoteProperty::toXML() const
{ {
return XML::XNode(); return XML::XElement();
// XML::XElement(ns.w + "endnotePr",
// XML::Write(NumFormat) +
// XML::Write(ns.w + "numStart", ns.w + "val", NumStart)
// );
} }
} // namespace Logic } // namespace Logic
......
...@@ -50,10 +50,7 @@ namespace OOX ...@@ -50,10 +50,7 @@ namespace OOX
const XML::XNode EndnoteReference::toXML() const const XML::XNode EndnoteReference::toXML() const
{ {
return XML::XElement(ns.w + "endnoteReference", return XML::XElement();
XML::XAttribute(ns.w + "customMarkFollows", CustomMarkFollows) +
XML::XAttribute(ns.w + "id", Id)
);
} }
const std::string EndnoteReference::toTxt() const const std::string EndnoteReference::toTxt() const
......
...@@ -51,18 +51,7 @@ namespace OOX ...@@ -51,18 +51,7 @@ namespace OOX
const XML::XNode Extrusion::toXML() const const XML::XNode Extrusion::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,8 +43,7 @@ namespace OOX ...@@ -43,8 +43,7 @@ namespace OOX
const XML::XNode F::toXML() const const XML::XNode F::toXML() const
{ {
return XML::XElement("f",XML::XAttribute("eqn", Eqn)); return XML::XElement();
//return XML::XElement(ns.v + "f",XML::XAttribute("eqn", Eqn));
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode FieldCodes::toXML() const const XML::XNode FieldCodes::toXML() const
{ {
return XML::XElement(ns.o + "FieldCodes", XML::XText(Text)); return XML::XElement();
} }
} // namespace Logic } // namespace Logic
......
...@@ -48,15 +48,7 @@ namespace OOX ...@@ -48,15 +48,7 @@ namespace OOX
const XML::XNode Fill::toXML() const const XML::XNode Fill::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,10 +43,7 @@ namespace OOX ...@@ -43,10 +43,7 @@ namespace OOX
const XML::XNode FldChar::toXML() const const XML::XNode FldChar::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "fldChar",
XML::XAttribute(ns.w + "fldCharType", FldCharType)
);
} }
......
...@@ -44,11 +44,13 @@ namespace OOX ...@@ -44,11 +44,13 @@ namespace OOX
const XML::XNode FldSimple::toXML() const const XML::XNode FldSimple::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "fldSimple",
XML::XAttribute(ns.w + "instr", Instr) + //return
XML::Write(Run) // XML::XElement(ns.w + "fldSimple",
); // XML::XAttribute(ns.w + "instr", Instr) +
// XML::Write(Run)
// );
} }
......
...@@ -52,11 +52,7 @@ namespace OOX ...@@ -52,11 +52,7 @@ namespace OOX
const XML::XNode FootNoteProperty::toXML() const const XML::XNode FootNoteProperty::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "footnotePr",
XML::Write(NumFormat) +
XML::Write(ns.w + "numStart", ns.w + "val", NumStart)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -44,13 +44,7 @@ namespace OOX ...@@ -44,13 +44,7 @@ namespace OOX
const XML::XNode FooterReference::toXML() const const XML::XNode FooterReference::toXML() const
{ {
return XML::XElement(); return XML::XElement();
//return
// XML::XElement(ns.w + "footerReference",
// XML::XAttribute(ns.r + "id", rId) +
// XML::XAttribute(ns.w + "type", Type)
// );
} }
......
...@@ -50,10 +50,7 @@ namespace OOX ...@@ -50,10 +50,7 @@ namespace OOX
const XML::XNode FootnoteReference::toXML() const const XML::XNode FootnoteReference::toXML() const
{ {
return XML::XElement(ns.w + "footnoteReference", return XML::XElement();
XML::XAttribute(ns.w + "customMarkFollows", CustomMarkFollows) +
XML::XAttribute(ns.w + "id", Id)
);
} }
......
...@@ -40,9 +40,8 @@ namespace OOX ...@@ -40,9 +40,8 @@ namespace OOX
} }
const XML::XNode Formulas::toXML() const const XML::XNode Formulas::toXML() const
{ {
//return XML::XElement(ns.v + "formulas", XML::Write(Fs)); return XML::XElement();
return XML::XElement("formulas", XML::Write(Fs));
} }
} // namespace Logic } // namespace Logic
......
...@@ -44,13 +44,7 @@ namespace OOX ...@@ -44,13 +44,7 @@ namespace OOX
const XML::XNode Graphic::toXML() const const XML::XNode Graphic::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.a + "graphic",
XML::XElement(ns.a + "graphicData",
XML::XAttribute("uri", Uri) +
XML::Write(Pic)
)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -38,7 +38,7 @@ namespace OOX ...@@ -38,7 +38,7 @@ namespace OOX
const XML::XNode GridColumn::toXML() const const XML::XNode GridColumn::toXML() const
{ {
return XML::XElement(ns.w + "gridCol", XML::XAttribute(ns.w + "w", Width)); return XML::XElement();
} }
} // namespace Logic } // namespace Logic
......
...@@ -94,7 +94,7 @@ namespace OOX ...@@ -94,7 +94,7 @@ namespace OOX
const XML::XNode GroupItem::toXML() const const XML::XNode GroupItem::toXML() const
{ {
return XML::XNode(); //XML::Write(m_item); return XML::XElement();
} }
} }
......
...@@ -45,13 +45,7 @@ namespace OOX ...@@ -45,13 +45,7 @@ namespace OOX
const XML::XNode H::toXML() const const XML::XNode H::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.v + "h",
XML::XAttribute("position", Position) +
XML::XAttribute("xrange", XRange) +
XML::XAttribute("yrange", YRange)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode Handles::toXML() const const XML::XNode Handles::toXML() const
{ {
return XML::XElement(ns.v + "handles", XML::Write(Hs)); return XML::XElement();
} }
} // namespace Logic } // namespace Logic
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode HeaderReference::toXML() const const XML::XNode HeaderReference::toXML() const
{ {
return XML::XElement(); return XML::XElement();
// XML::XElement(ns.w + "headerReference",
// XML::XAttribute(ns.r + "id", rId) +
// XML::XAttribute(ns.w + "type", Type)
// );
} }
......
...@@ -42,13 +42,7 @@ namespace OOX ...@@ -42,13 +42,7 @@ namespace OOX
const XML::XNode Hyperlink::toXML() const const XML::XNode Hyperlink::toXML() const
{ {
return XML::XElement(); 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)
//);
} }
const std::string Hyperlink::toTxt() const const std::string Hyperlink::toTxt() const
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode ImageData::toXML() const const XML::XNode ImageData::toXML() const
{ {
return XML::XElement(); return XML::XElement();
//XML::XElement(ns.v + "imagedata",
// XML::XAttribute(ns.r + "id", rId) +
// XML::XAttribute(ns.o + "title", Title)
//);
} }
} // namespace Logic } // namespace Logic
......
...@@ -69,13 +69,7 @@ namespace OOX ...@@ -69,13 +69,7 @@ namespace OOX
const XML::XNode Ind::toXML() const const XML::XNode Ind::toXML() const
{ {
return return XML::XElement();
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)
);
} }
......
...@@ -95,52 +95,52 @@ namespace OOX ...@@ -95,52 +95,52 @@ namespace OOX
const XML::XNode Inline::toXML() const const XML::XNode Inline::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.wp + Name.ToString(), //XML::XElement(ns.wp + Name.ToString(),
XML::XAttribute("distT", DistT) + // XML::XAttribute("distT", DistT) +
XML::XAttribute("distB", DistB) + // XML::XAttribute("distB", DistB) +
XML::XAttribute("distL", DistL) + // XML::XAttribute("distL", DistL) +
XML::XAttribute("distR", DistR) + // XML::XAttribute("distR", DistR) +
XML::XAttribute("simplePos", SimplePos) + // XML::XAttribute("simplePos", SimplePos) +
XML::XAttribute("relativeHeight", RelativeHeight) + // XML::XAttribute("relativeHeight", RelativeHeight) +
XML::XAttribute("behindDoc", BehindDoc) + // XML::XAttribute("behindDoc", BehindDoc) +
XML::XAttribute("locked", Locked) + // XML::XAttribute("locked", Locked) +
XML::XAttribute("layoutInCell", LayoutInCell) + // XML::XAttribute("layoutInCell", LayoutInCell) +
XML::XAttribute("allowOverlap", AllowOverlap) + // XML::XAttribute("allowOverlap", AllowOverlap) +
XML::Write(SimplePosPoint) + // XML::Write(SimplePosPoint) +
WriteIf( // WriteIf(
XML::XElement(ns.wp + "positionH", // XML::XElement(ns.wp + "positionH",
XML::XAttribute("relativeFrom", positionHRelativeFrom.get_value_or("column")) + // XML::XAttribute("relativeFrom", positionHRelativeFrom.get_value_or("column")) +
WriteIf( XML::XElement(ns.wp + "posOffset", // WriteIf( XML::XElement(ns.wp + "posOffset",
XML::XText(positionH) // XML::XText(positionH)
), positionH.is_init()) + // ), positionH.is_init()) +
WriteIf( XML::XElement(ns.wp + "align", // WriteIf( XML::XElement(ns.wp + "align",
XML::XText(positionHAlign) // XML::XText(positionHAlign)
), positionHAlign.is_init()) // ), positionHAlign.is_init())
), positionH.is_init() || positionHAlign.is_init()) + // ), positionH.is_init() || positionHAlign.is_init()) +
WriteIf( // WriteIf(
XML::XElement(ns.wp + "positionV", // XML::XElement(ns.wp + "positionV",
XML::XAttribute("relativeFrom", positionVRelativeFrom.get_value_or("paragraph")) + // XML::XAttribute("relativeFrom", positionVRelativeFrom.get_value_or("paragraph")) +
WriteIf( XML::XElement(ns.wp + "posOffset", // WriteIf( XML::XElement(ns.wp + "posOffset",
XML::XText(positionV) // XML::XText(positionV)
), positionV.is_init()) + // ), positionV.is_init()) +
WriteIf( XML::XElement(ns.wp + "align", // WriteIf( XML::XElement(ns.wp + "align",
XML::XText(positionVAlign) // XML::XText(positionVAlign)
), positionVAlign.is_init()) // ), positionVAlign.is_init())
), positionV.is_init() || positionVAlign.is_init()) + // ), positionV.is_init() || positionVAlign.is_init()) +
XML::Write(Extent) + // XML::Write(Extent) +
XML::Write(EffectExtent) + // XML::Write(EffectExtent) +
XML::Write(Wrap) + // XML::Write(Wrap) +
XML::Write(DocPr) + // XML::Write(DocPr) +
XML::XElement(ns.wp + "cNvGraphicFramePr", // XML::XElement(ns.wp + "cNvGraphicFramePr",
XML::XElement(ns.a + "graphicFrameLocks", // XML::XElement(ns.a + "graphicFrameLocks",
XML::XAttribute("noChangeAspect", NoChangeAspect) // XML::XAttribute("noChangeAspect", NoChangeAspect)
) // )
) + // ) +
XML::Write(Graphic) // XML::Write(Graphic)
); //);
} }
} // namespace Logic } // namespace Logic
......
...@@ -48,13 +48,7 @@ namespace OOX ...@@ -48,13 +48,7 @@ namespace OOX
const XML::XNode Insert::toXML() const const XML::XNode Insert::toXML() const
{ {
return return XML::XElement();
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)
);
} }
......
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode InstrText::toXML() const const XML::XNode InstrText::toXML() const
{ {
return XML::XElement(ns.w + "instrText", XML::XText(Text)); return XML::XElement();
} }
......
...@@ -45,12 +45,7 @@ namespace OOX ...@@ -45,12 +45,7 @@ namespace OOX
const XML::XNode Lang::toXML() const const XML::XNode Lang::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "lang",
XML::XAttribute(ns.w + "val", Value) +
XML::XAttribute(ns.w + "eastAsia", EastAsia) +
XML::XAttribute(ns.w + "bidi", Bidi)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -42,11 +42,7 @@ namespace OOX ...@@ -42,11 +42,7 @@ namespace OOX
const XML::XNode LnNumType::toXML() const const XML::XNode LnNumType::toXML() const
{ {
return XML::XElement(ns.w + "lnNumType", return XML::XElement();
XML::XAttribute(ns.w + "countBy", countBy) +
XML::XAttribute(ns.w + "start", start) +
//XML::XAttribute(ns.w + "distance", distance) +
XML::XAttribute(ns.w + "restart", restart) );
} }
} }
} }
\ No newline at end of file
...@@ -46,13 +46,7 @@ namespace OOX ...@@ -46,13 +46,7 @@ namespace OOX
const XML::XNode Lock::toXML() const const XML::XNode Lock::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.o + "lock",
XML::XAttribute("aspectratio", Aspectratio) +
XML::XAttribute(ns.v + "ext", Ext) +
XML::XAttribute("text", Text) +
XML::XAttribute("shapetype", ShapeType)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -72,10 +72,7 @@ namespace OOX ...@@ -72,10 +72,7 @@ namespace OOX
const XML::XNode NumFormat::toXML() const const XML::XNode NumFormat::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "numFmt",
XML::XAttribute(ns.w + "val", ToString())
);
} }
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode NumPr::toXML() const const XML::XNode NumPr::toXML() const
{ {
return return XML::XElement();
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))
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -50,16 +50,7 @@ namespace OOX ...@@ -50,16 +50,7 @@ namespace OOX
const XML::XNode OleObject::toXML() const const XML::XNode OleObject::toXML() const
{ {
return XML::XElement(); 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)
//);
} }
} // namespace Logic } // namespace Logic
......
...@@ -47,8 +47,8 @@ namespace OOX ...@@ -47,8 +47,8 @@ namespace OOX
} }
const XML::XNode Oval::toXML() const 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 } // namespace Logic
......
...@@ -44,9 +44,7 @@ namespace OOX ...@@ -44,9 +44,7 @@ namespace OOX
const XML::XNode PageBorders::toXML() const const XML::XNode PageBorders::toXML() const
{ {
return XML::XElement(ns.w + "pgBorders", return XML::XElement();
XML::XAttribute(ns.w + "offsetFrom", OffsetFrom) +
XML::Write(Top) + XML::Write(Bottom) + XML::Write(Left) + XML::Write(Right));
} }
} // namespace Logic } // namespace Logic
......
...@@ -49,16 +49,7 @@ namespace OOX ...@@ -49,16 +49,7 @@ namespace OOX
const XML::XNode PageMargin::toXML() const const XML::XNode PageMargin::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -41,10 +41,7 @@ namespace OOX ...@@ -41,10 +41,7 @@ namespace OOX
const XML::XNode PageSize::toXML() const const XML::XNode PageSize::toXML() const
{ {
return XML::XElement(ns.w + "pgSz", return XML::XElement();
XML::XAttribute(ns.w + "w", Width) +
XML::XAttribute(ns.w + "h", Height) +
XML::XAttribute(ns.w + "orient", Orient));
} }
} // namespace Logic } // namespace Logic
......
...@@ -85,11 +85,7 @@ namespace OOX ...@@ -85,11 +85,7 @@ namespace OOX
const XML::XNode Paragraph::toXML() const const XML::XNode Paragraph::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "p",
XML::Write(Property) +
XML::Write(Items)
);
} }
......
...@@ -46,12 +46,7 @@ namespace OOX ...@@ -46,12 +46,7 @@ namespace OOX
const XML::XNode ParagraphBorder::toXML() const const XML::XNode ParagraphBorder::toXML() const
{ {
return XML::XElement(ns.w + "pBdr", return XML::XElement();
XML::Write(Top) +
XML::Write(Bottom) +
XML::Write(Left) +
XML::Write(Right)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -69,28 +69,7 @@ namespace OOX ...@@ -69,28 +69,7 @@ namespace OOX
const XML::XNode ParagraphProperty::toXML() const const XML::XNode ParagraphProperty::toXML() const
{ {
return XML::XElement(ns.w + "pPr", return XML::XElement();
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));
} }
const bool ParagraphProperty::isSimple() const const bool ParagraphProperty::isSimple() const
......
...@@ -39,12 +39,7 @@ namespace OOX ...@@ -39,12 +39,7 @@ namespace OOX
const XML::XNode ParagraphPropertyChange::toXML() const const XML::XNode ParagraphPropertyChange::toXML() const
{ {
return XML::XElement(); 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)
//);
} }
} // namespace Logic } // namespace Logic
......
...@@ -52,18 +52,7 @@ namespace OOX ...@@ -52,18 +52,7 @@ namespace OOX
const XML::XNode Path::toXML() const const XML::XNode Path::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -53,18 +53,7 @@ namespace OOX ...@@ -53,18 +53,7 @@ namespace OOX
const XML::XNode Pict::toXML() const const XML::XNode Pict::toXML() const
{ {
return return XML::XElement();
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)
);
} }
const std::string Pict::toTxt() const const std::string Pict::toTxt() const
......
...@@ -46,10 +46,7 @@ namespace OOX ...@@ -46,10 +46,7 @@ namespace OOX
const XML::XNode Point2D::toXML() const const XML::XNode Point2D::toXML() const
{ {
return XML::XElement(ns.wp + *name, return XML::XElement();
XML::XAttribute("x", x) +
XML::XAttribute("y", y)
);
} }
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -47,18 +47,7 @@ namespace OOX ...@@ -47,18 +47,7 @@ namespace OOX
const XML::XNode RFonts::toXML() const const XML::XNode RFonts::toXML() const
{ {
return return XML::XElement();
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)
);
} }
void RFonts::setFontName(const nullable__<std::string>& fontName) void RFonts::setFontName(const nullable__<std::string>& fontName)
......
...@@ -48,7 +48,7 @@ namespace OOX ...@@ -48,7 +48,7 @@ namespace OOX
const XML::XNode Rect::toXML() const 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 } // namespace Logic
......
...@@ -48,8 +48,8 @@ namespace OOX ...@@ -48,8 +48,8 @@ namespace OOX
} }
const XML::XNode Roundrect::toXML() const 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 } // namespace Logic
......
...@@ -111,11 +111,7 @@ namespace OOX ...@@ -111,11 +111,7 @@ namespace OOX
const XML::XNode Run::toXML() const const XML::XNode Run::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "r",
XML::Write(Property) +
XML::Write(Items)
);
} }
......
...@@ -117,7 +117,7 @@ namespace OOX ...@@ -117,7 +117,7 @@ namespace OOX
const XML::XNode RunItem::toXML() const const XML::XNode RunItem::toXML() const
{ {
return XML::XNode(); // return XML::Write(m_item); return XML::XElement();
} }
void RunItem::fromTxt(const std::string& text) void RunItem::fromTxt(const std::string& text)
......
...@@ -153,55 +153,9 @@ namespace OOX ...@@ -153,55 +153,9 @@ namespace OOX
const XML::XNode RunProperty::toXML() const const XML::XNode RunProperty::toXML() const
{ {
return return XML::XElement();
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)
);
} }
const bool RunProperty::isSimple() const const bool RunProperty::isSimple() const
{ {
/*const bool bold = Bold; /*const bool bold = Bold;
......
...@@ -46,12 +46,7 @@ namespace OOX ...@@ -46,12 +46,7 @@ namespace OOX
const XML::XNode RunPropertyChange::toXML() const const XML::XNode RunPropertyChange::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "rPrChange",
XML::XAttribute(ns.w + "id", Id) +
XML::XAttribute(ns.w + "author", Author) +
XML::XAttribute(ns.w + "date", Date)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -45,12 +45,7 @@ namespace OOX ...@@ -45,12 +45,7 @@ namespace OOX
const XML::XNode Sdt::toXML() const const XML::XNode Sdt::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "sdt",
XML::Write(Property) +
XML::Write(EndProperty) +
XML::Write(Content)
);
} }
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -36,7 +36,7 @@ namespace OOX ...@@ -36,7 +36,7 @@ namespace OOX
const XML::XNode SdtContent::toXML() const const XML::XNode SdtContent::toXML() const
{ {
return XML::XElement();//ns.w + "sdtContent", XML::Write(Items)); return XML::XElement();
} }
} // namespace Logic } // namespace Logic
......
...@@ -46,13 +46,7 @@ namespace OOX ...@@ -46,13 +46,7 @@ namespace OOX
const XML::XNode SdtEndProperty::toXML() const const XML::XNode SdtEndProperty::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode SdtProperty::toXML() const const XML::XNode SdtProperty::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "sdtPr",
XML::Write(ns.w + "id", ns.w + "val", Id) +
XML::Write(DocPartObj)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -67,19 +67,7 @@ namespace OOX ...@@ -67,19 +67,7 @@ namespace OOX
const XML::XNode SectorProperty::toXML() const const XML::XNode SectorProperty::toXML() const
{ {
return XML::XElement(ns.w + "sectPr", return XML::XElement();
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));
} }
} // namespace Logic } // namespace Logic
......
...@@ -41,7 +41,7 @@ namespace OOX ...@@ -41,7 +41,7 @@ namespace OOX
const XML::XNode Separator::toXML() const const XML::XNode Separator::toXML() const
{ {
return XML::XElement(ns.w + "separator"); return XML::XElement();
} }
......
...@@ -41,10 +41,7 @@ namespace OOX ...@@ -41,10 +41,7 @@ namespace OOX
const XML::XNode Shading::toXML() const const XML::XNode Shading::toXML() const
{ {
return XML::XElement(ns.w + "shd", return XML::XElement();
XML::XAttribute(ns.w + "val", value) +
XML::XAttribute(ns.w + "color", color) +
XML::XAttribute(ns.w + "fill", fill));
} }
} // namespace Logic } // namespace Logic
......
...@@ -51,18 +51,7 @@ namespace OOX ...@@ -51,18 +51,7 @@ namespace OOX
const XML::XNode Shadow::toXML() const const XML::XNode Shadow::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -63,22 +63,7 @@ namespace OOX ...@@ -63,22 +63,7 @@ namespace OOX
const XML::XNode Shape::toXML() const const XML::XNode Shape::toXML() const
{ {
return return XML::XElement();
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));
} }
} // namespace Logic } // namespace Logic
......
...@@ -52,25 +52,8 @@ namespace OOX ...@@ -52,25 +52,8 @@ namespace OOX
} }
const XML::XNode ShapeType::toXML() const const XML::XNode ShapeType::toXML() const
{ {
return return XML::XElement();
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)
);
} }
} // namespace Logic } // namespace Logic
......
...@@ -67,17 +67,7 @@ namespace OOX ...@@ -67,17 +67,7 @@ namespace OOX
const XML::XNode Spacing::toXML() const const XML::XNode Spacing::toXML() const
{ {
return return XML::XElement();
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)
);
} }
......
...@@ -41,7 +41,7 @@ namespace OOX ...@@ -41,7 +41,7 @@ namespace OOX
const XML::XNode Stroke::toXML() const 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 } // namespace Logic
......
...@@ -63,11 +63,7 @@ namespace OOX ...@@ -63,11 +63,7 @@ namespace OOX
const XML::XNode Symbol::toXML() const const XML::XNode Symbol::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "sym",
XML::XAttribute(ns.w + "font", Font) +
XML::XAttribute(ns.w + "char", Char)
);
} }
......
...@@ -42,12 +42,7 @@ namespace OOX ...@@ -42,12 +42,7 @@ namespace OOX
const XML::XNode TCMar::toXML() const const XML::XNode TCMar::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "tcMar",
XML::Write(Top) +
XML::Write(Left) +
XML::Write(Bottom) +
XML::Write(Right));
} }
} // namespace Logic } // namespace Logic
......
...@@ -59,7 +59,7 @@ namespace OOX ...@@ -59,7 +59,7 @@ namespace OOX
const XML::XNode Tab::toXML() const const XML::XNode Tab::toXML() const
{ {
return XML::XElement(ns.w + "tab"); return XML::XElement();
} }
......
...@@ -51,12 +51,7 @@ namespace OOX ...@@ -51,12 +51,7 @@ namespace OOX
const XML::XNode TabProperty::toXML() const const XML::XNode TabProperty::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "tab",
XML::XAttribute(ns.w + "val", Val) +
XML::XAttribute(ns.w + "leader", Leader) +
XML::XAttribute(ns.w + "pos", Pos)
);
} }
} // namespace Logic } // namespace Logic
} // namespace OOX } // namespace OOX
\ No newline at end of file
...@@ -43,7 +43,7 @@ namespace OOX ...@@ -43,7 +43,7 @@ namespace OOX
const XML::XNode Table::toXML() const 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() void Table::SetCountsVMerged()
......
...@@ -44,13 +44,7 @@ namespace OOX ...@@ -44,13 +44,7 @@ namespace OOX
const XML::XNode TableBorders::toXML() const const XML::XNode TableBorders::toXML() const
{ {
return XML::XElement(ns.w + "tblBorders", return XML::XElement();
XML::Write(top) +
XML::Write(bottom) +
XML::Write(left) +
XML::Write(right) +
XML::Write(insideV) +
XML::Write(insideH));
} }
} // namespace Logic } // namespace Logic
......
...@@ -43,12 +43,7 @@ namespace OOX ...@@ -43,12 +43,7 @@ namespace OOX
const XML::XNode TableCell::toXML() const const XML::XNode TableCell::toXML() const
{ {
return return XML::XElement();
XML::XElement(ns.w + "tc",
XML::Write(Properties) +
XML::Write(Items) +
XML::WriteIf(XML::XElement(ns.w + "p"), !hasParagraph())
);
} }
......
...@@ -44,11 +44,7 @@ namespace OOX ...@@ -44,11 +44,7 @@ namespace OOX
const XML::XNode TableCellBorders::toXML() const const XML::XNode TableCellBorders::toXML() const
{ {
return XML::XElement(ns.w + "tcBorders", return XML::XElement();
XML::Write(top) +
XML::Write(bottom) +
XML::Write(left) +
XML::Write(right));
} }
} // namespace Logic } // namespace Logic
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment