.

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -1195,7 +1195,7 @@ void docx_conversion_context::process_headers_footers()
     // проходим по всем page layout
     BOOST_FOREACH(const odf_reader::style_master_page* page, pageLayouts.master_pages())
     {
-        const std::wstring & styleName = page->style_master_page_attlist_.style_name_.get_value_or( L"" );
+        const std::wstring & styleName = page->attlist_.style_name_.get_value_or( L"" );
         const std::wstring masterPageNameLayout =context.pageLayoutContainer().page_layout_name_by_style(styleName);
         add_page_properties(masterPageNameLayout);
 		

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

@@ -272,9 +272,9 @@ void pptx_conversion_context::end_document()
     odf_reader::odf_read_context & context =  root()->odf_context();
     odf_reader::page_layout_container & pageLayouts = context.pageLayoutContainer();
 	
-	if ((pageLayouts.master_pages().size() > 0) && (pageLayouts.master_pages()[0]->style_master_page_attlist_.style_name_))//default
+	if ((pageLayouts.master_pages().size() > 0) && (pageLayouts.master_pages()[0]->attlist_.style_name_))//default
 	{
-		const std::wstring masterStyleName = pageLayouts.master_pages()[0]->style_master_page_attlist_.style_name_.get();
+		const std::wstring masterStyleName = pageLayouts.master_pages()[0]->attlist_.style_name_.get();
 		const std::wstring pageProperties = root()->odf_context().pageLayoutContainer().page_layout_name_by_style(masterStyleName);
 
 		odf_reader::page_layout_instance *pages_layouts = root()->odf_context().pageLayoutContainer().page_layout_by_name(pageProperties);

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

@@ -55,6 +55,7 @@ public:
     std::wstringstream	autofilter_;
 	std::wstringstream	conditionalFormatting_;
 	std::wstringstream	ole_objects_;
+	std::wstringstream	page_props_;
 
 	rels hyperlinks_rels_;
 	rels ole_objects_rels_;
@@ -134,6 +135,11 @@ std::wostream & xlsx_xml_worksheet::ole_objects()
 {
     return impl_->ole_objects_;
 }
+std::wostream & xlsx_xml_worksheet::page_properties()
+{
+    return impl_->page_props_;
+}
+
 //---------------------------------------------------------------------------------------
 rels & xlsx_xml_worksheet::hyperlinks_rels()
 {
@@ -196,9 +202,13 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
             {
                 CP_XML_NODE(L"oleObjects")
                 {
-                    CP_XML_STREAM() << impl_->ole_objects_.str();
+					CP_XML_STREAM() << impl_->ole_objects_.str();
                 }
             }
+			if (!impl_->page_props_.str().empty())
+            {
+				CP_XML_STREAM() << impl_->page_props_.str();
+			}
 			//CP_XML_NODE(L"headerFooter){}
 
 			//CP_XML_NODE(L"rowBreaks){}

ASCOfficeOdfFile/src/docx/xlsx_output_xml.h

@@ -63,6 +63,7 @@ public:
 	std::wostream & conditionalFormatting();
 	std::wostream & sort();
 	std::wostream & ole_objects();
+	std::wostream & page_properties();
 	
 	rels & hyperlinks_rels();
 	rels & ole_objects_rels();

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -341,11 +341,26 @@ double charsToSize(unsigned int charsCount, double maxDigitSize)
 	return 1.0 * int((maxDigitSize * charsCount + 5.0) / maxDigitSize * 256.0) / 256.0;
 }
 
-void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
+void xlsx_table_state::serialize_page_properties (std::wostream & strm)
+{
+	_CP_OPT(std::wstring) masterPageName = context_->root()->odf_context().styleContainer().master_page_name_by_name(table_style_);
+	if (!masterPageName) return;
+
+	odf_reader::style_master_page* master_style_ = context_->root()->odf_context().pageLayoutContainer().master_page_by_name(*masterPageName);
+	if (!master_style_) return;
+	if (!master_style_->attlist_.style_page_layout_name_) return;
+
+	odf_reader::page_layout_instance * page_layout = context_->root()->odf_context().pageLayoutContainer().page_layout_by_name(*master_style_->attlist_.style_page_layout_name_);
+	if (!page_layout) return;
+
+	page_layout->xlsx_serialize(strm, *context_);
+}
+
+void xlsx_table_state::serialize_table_format (std::wostream & strm)
 {
 	odf_reader::odf_read_context & odfContext = context_->root()->odf_context();
 
-	CP_XML_WRITER(_Wostream)
+	CP_XML_WRITER(strm)
 	{
 		odf_reader::style_table_properties	* table_prop = NULL;
 		odf_reader::style_instance			* tableStyle = odfContext.styleContainer().style_by_name(table_style_, odf_types::style_family::Table, false);
@@ -435,9 +450,9 @@ void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
 		{
 			const odf_reader::style_table_row_properties * prop = rowDefStyle->content()->get_style_table_row_properties();
 
-			if ( (prop) &&  (prop->style_table_row_properties_attlist_.style_row_height_))
+			if ( (prop) &&  (prop->attlist_.style_row_height_))
 			{
-				default_height = prop->style_table_row_properties_attlist_.style_row_height_->get_value_unit(odf_types::length::pt);
+				default_height = prop->attlist_.style_row_height_->get_value_unit(odf_types::length::pt);
 			}
 			std::wstringstream ht_s;
 			ht_s.precision(1);
@@ -451,21 +466,21 @@ void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
 	}
 
 }
-void xlsx_table_state::serialize_merge_cells(std::wostream & _Wostream)
+void xlsx_table_state::serialize_merge_cells(std::wostream & strm)
 {
-    return xlsx_merge_cells_.xlsx_serialize(_Wostream);
+    return xlsx_merge_cells_.xlsx_serialize(strm);
 }
-void xlsx_table_state::serialize_ole_objects(std::wostream & _Wostream)
+void xlsx_table_state::serialize_ole_objects(std::wostream & strm)
 {
-    return xlsx_drawing_context_.get_drawings()->serialize_objects(_Wostream);
+    return xlsx_drawing_context_.get_drawings()->serialize_objects(strm);
 }
-void xlsx_table_state::serialize_hyperlinks(std::wostream & _Wostream)
+void xlsx_table_state::serialize_hyperlinks(std::wostream & strm)
 {
-    return xlsx_hyperlinks_.xlsx_serialize(_Wostream);
+    return xlsx_hyperlinks_.xlsx_serialize(strm);
 }
-void xlsx_table_state::serialize_conditionalFormatting(std::wostream & _Wostream)
+void xlsx_table_state::serialize_conditionalFormatting(std::wostream & strm)
 {
-    return xlsx_conditionalFormatting_context_.serialize(_Wostream);
+    return xlsx_conditionalFormatting_context_.serialize(strm);
 }
 void xlsx_table_state::dump_rels_hyperlinks(rels & Rels)
 {

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

@@ -128,7 +128,8 @@ public:
 	void serialize_merge_cells				(std::wostream & _Wostream);
     void serialize_hyperlinks				(std::wostream & _Wostream);
     void serialize_ole_objects				(std::wostream & _Wostream);
-    
+	void serialize_page_properties			(std::wostream & _Wostream);
+
 	void dump_rels_hyperlinks				(rels & Rels);
 	void dump_rels_ole_objects				(rels & Rels);
 

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -317,6 +317,10 @@ void xlsx_table_context::serialize_table_format(std::wostream & _Wostream)
 {
     return state()->serialize_table_format(_Wostream);
 }
+void xlsx_table_context::serialize_page_properties(std::wostream & _Wostream)
+{
+    return state()->serialize_page_properties(_Wostream);
+}
 void xlsx_table_context::serialize_hyperlinks(std::wostream & _Wostream)
 {
     return state()->serialize_hyperlinks(_Wostream);

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.h

@@ -90,6 +90,7 @@ public:
 	void serialize_conditionalFormatting(std::wostream & _Wostream);
 	void serialize_hyperlinks			(std::wostream & _Wostream);
 	void serialize_ole_objects			(std::wostream & _Wostream);
+	void serialize_page_properties		(std::wostream & _Wostream);
 
 	xlsx_table_metrics & get_table_metrics();
   

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -369,6 +369,7 @@ void xlsx_conversion_context::end_table()
     current_sheet().cols() << L"</cols>";
     
 	get_table_context().serialize_table_format			(current_sheet().sheetFormat());
+	get_table_context().serialize_page_properties		(current_sheet().page_properties());
 	get_table_context().serialize_conditionalFormatting	(current_sheet().conditionalFormatting());
     get_table_context().serialize_autofilter			(current_sheet().autofilter());
     get_table_context().serialize_sort					(current_sheet().sort());
@@ -420,7 +421,7 @@ void xlsx_conversion_context::end_table()
         current_sheet().set_comments_link(commentsName.first, commentsName.second);
         current_sheet().set_vml_drawing_link(vml_drawingName.first, vml_drawingName.second);
     }    
-
+//background picture
     get_table_context().end_table();
 }
 

ASCOfficeOdfFile/src/odf/calcs_styles.cpp

@@ -161,7 +161,7 @@ style_table_cell_properties_attlist calc_table_cell_properties(const std::vector
     BOOST_FOREACH(const style_table_cell_properties* v, props)
     {
         if (v)
-            result.apply_from(v->style_table_cell_properties_attlist_);
+            result.apply_from(v->attlist_);
     }
     return result;
 }

ASCOfficeOdfFile/src/odf/datatypes/length.cpp

@@ -200,7 +200,11 @@ double pt_to_cm(double Val)
     return Val / 28.34467120181406;
     
 }
-
+double pt_to_mm(double Val)
+{
+    return Val / 2.834467120181406;
+    
+}
 double to_pt(const length & Val)
 {
     switch(Val.get_unit())
@@ -247,7 +251,11 @@ double length::get_value_unit(unit Unit) const
     {
         return pt_to_cm( to_pt(*this) );
     }
-    else
+    else if (Unit == mm)
+    {
+        return pt_to_mm( to_pt(*this) );
+    }
+	else
     {
         return 0.0;
     }

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -153,7 +153,7 @@ length ComputeContextWidth(const style_page_layout_properties			* pageProperties
             if (pagePropertiesNode)
             {
                 if (const style_columns * styleColumns 
-                    = dynamic_cast<const style_columns*>( pagePropertiesNode->style_page_layout_properties_elements_.style_columns_.get()))
+                    = dynamic_cast<const style_columns*>( pagePropertiesNode->elements_.style_columns_.get()))
                 {
                     columnsCount = styleColumns->fo_column_count_.get_value_or(1);
                     if (!columnsCount)
@@ -784,7 +784,7 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
     style_page_layout_properties_attlist	emptyPageProperties;
     
 	const style_page_layout_properties_attlist &	pageProperties =
-		pagePropertiesNode ? pagePropertiesNode->style_page_layout_properties_attlist_ : emptyPageProperties;
+		pagePropertiesNode ? pagePropertiesNode->attlist_ : emptyPageProperties;
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -462,8 +462,8 @@ void odf_document::Impl::parse_styles()
                     continue;
                 }
 
-                const std::wstring styleName = masterPage->style_master_page_attlist_.style_name_.get_value_or(L"");
-                const std::wstring pageLayoutName = masterPage->style_master_page_attlist_.style_page_layout_name_.get_value_or(L"");
+                const std::wstring styleName = masterPage->attlist_.style_name_.get_value_or(L"");
+                const std::wstring pageLayoutName = masterPage->attlist_.style_page_layout_name_.get_value_or(L"");
 
                 context_->pageLayoutContainer().add_master_page(styleName, pageLayoutName, masterPage);
             }        

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -40,23 +40,24 @@ namespace cpdoccore {
 namespace odf_reader {
 
 style_instance::style_instance(
-    styles_container   *Container,
-    const std::wstring  &Name,
-    style_family::type	Type,
-    style_content      *Content,
-    bool IsAutomatic,
-    bool IsDefault,
-    const std::wstring & ParentStyleName,
-    const std::wstring & NextStyleName,
-    const std::wstring & DataStyleName
-    ) : container_(Container),
-    name_(Name),
-    style_type_(Type),
-    content_(Content),
-    is_automatic_(IsAutomatic),
-    is_default_(IsDefault),
-    next_name_(NextStyleName),
-    next_(Container->style_by_name(NextStyleName, style_type_,false)),
+		styles_container   *Container,
+		const std::wstring  &Name,
+		style_family::type	Type,
+		style_content      *Content,
+		bool IsAutomatic,
+		bool IsDefault,
+		const std::wstring & ParentStyleName,
+		const std::wstring & NextStyleName,
+		const std::wstring & DataStyleName
+		) :
+	container_		(Container),
+    name_			(Name),
+    style_type_		(Type),
+    content_		(Content),
+    is_automatic_	(IsAutomatic),
+    is_default_		(IsDefault),
+    next_name_		(NextStyleName),
+    next_			(Container->style_by_name(NextStyleName, style_type_, false)),
     data_style_name_(DataStyleName)
 {
 	parent_name_ = ParentStyleName;
@@ -64,8 +65,7 @@ style_instance::style_instance(
 	{
 		parent_name_ = L"Standard";
 	}
-    parent_ = Container->style_by_name(parent_name_, style_type_,false);
-
+    parent_ = Container->style_by_name(parent_name_, style_type_, false);
 }
    
 style_instance * styles_container::hyperlink_style()
@@ -325,6 +325,13 @@ style_page_layout_properties * page_layout_instance::properties() const
     return dynamic_cast<style_page_layout_properties *>(style_page_layout_->style_page_layout_properties_.get());
 }
 
+void page_layout_instance::xlsx_serialize(std::wostream & strm, oox::xlsx_conversion_context & Context)
+{
+	style_page_layout_properties * props = properties();
+	if (props)
+		props->xlsx_serialize(strm, Context);   
+}
+
 void page_layout_instance::docx_convert_serialize(std::wostream & strm, oox::docx_conversion_context & Context)
 {
     const style_header_style * headerStyle = dynamic_cast<style_header_style *>(style_page_layout_->style_header_style_.get());
@@ -348,8 +355,10 @@ void page_layout_instance::docx_convert_serialize(std::wostream & strm, oox::doc
         _CP_OPT(length) bottom = attr.fo_min_height_ ? attr.fo_min_height_ : attr.svg_height_;
         Context.get_header_footer_context().set_footer(bottom);
     }
-
-    properties()->docx_convert_serialize(strm, Context);   
+	
+	style_page_layout_properties * props = properties();
+    if (props)
+		props->docx_convert_serialize(strm, Context);   
 }
 void page_layout_instance::pptx_convert(oox::pptx_conversion_context & Context)
 {

ASCOfficeOdfFile/src/odf/odfcontext.h

@@ -193,8 +193,9 @@ public:
     const std::wstring & name() const;
     style_page_layout_properties * properties() const; 
     
-	void docx_convert_serialize(std::wostream & strm, oox::docx_conversion_context & Context);
- 	void pptx_convert(oox::pptx_conversion_context & Context);
+	void docx_convert_serialize	(std::wostream & strm, oox::docx_conversion_context & Context);
+ 	void xlsx_serialize			(std::wostream & strm, oox::xlsx_conversion_context & Context);
+	void pptx_convert			(oox::pptx_conversion_context & Context);
    
     const style_page_layout * style_page_layout_;
 

ASCOfficeOdfFile/src/odf/office_body.cpp

@@ -98,7 +98,7 @@ void office_body::docx_convert(oox::docx_conversion_context & Context)
     std::vector<style_master_page*> & masterPages = Context.root()->odf_context().pageLayoutContainer().master_pages();
     if (!masterPages.empty())
     {
-        Context.set_master_page_name(masterPages[0]->style_master_page_attlist_.style_name_.get_value_or(L"Standard"));
+        Context.set_master_page_name(masterPages[0]->attlist_.style_name_.get_value_or(L"Standard"));
     }
 
 	const page_layout_instance * layout = Context.root()->odf_context().pageLayoutContainer().page_layout_first();
@@ -116,15 +116,15 @@ void office_body::docx_convert(oox::docx_conversion_context & Context)
 //background (for all pages) 
     if (page_layout_instance * firtsPageLayout = Context.root()->odf_context().pageLayoutContainer().page_layout_by_name(Context.get_page_properties()))
 	{
-        if (style_page_layout_properties * prop = firtsPageLayout->properties())
+        if (style_page_layout_properties * layout_properties = firtsPageLayout->properties())
 		{
 			oox::_oox_fill fill;
 			
-			Compute_GraphicFill(prop->style_page_layout_properties_attlist_.common_draw_fill_attlist_, 
-								prop->style_page_layout_properties_elements_.style_background_image_, 
+			Compute_GraphicFill(layout_properties->attlist_.common_draw_fill_attlist_, 
+								layout_properties->elements_.style_background_image_, 
 								Context.root()->odf_context().drawStyles(), fill);
 
-			if (prop->style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_ || fill.type != 0)
+			if (layout_properties->attlist_.common_background_color_attlist_.fo_background_color_ || fill.type != 0)
 			{
 				if ((fill.bitmap) && (fill.bitmap->rId.empty()))
 				{
@@ -132,7 +132,7 @@ void office_body::docx_convert(oox::docx_conversion_context & Context)
 					fill.bitmap->rId = Context.add_mediaitem(href, oox::typeImage, fill.bitmap->isInternal, href);
 				}		
 				int id = Context.get_drawing_context().get_current_shape_id();
-				if (prop->docx_background_serialize(Context.output_stream(), Context, fill, id))
+				if (layout_properties->docx_background_serialize(Context.output_stream(), Context, fill, id))
 				{
 					Context.set_settings_property(odf_reader::_property(L"displayBackgroundShape", true));
 				}

ASCOfficeOdfFile/src/odf/style_table_properties.cpp

@@ -155,17 +155,17 @@ const wchar_t * style_table_properties::name = L"table-properties";
 
 void style_table_properties::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    table_format_properties_.add_attributes(Attributes);
+    content_.add_attributes(Attributes);
 }
 
 void style_table_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-    table_format_properties_.add_child_element(Reader, Ns, Name, getContext());
+    content_.add_child_element(Reader, Ns, Name, getContext());
 }
 
 void style_table_properties::docx_convert(oox::docx_conversion_context & Context)
 {
-    table_format_properties_.docx_convert(Context);
+    content_.docx_convert(Context);
 }
 
 // style-table-column-properties-attlist
@@ -186,7 +186,7 @@ const wchar_t * style_table_column_properties::name = L"table-column-properties"
 
 void style_table_column_properties::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    style_table_column_properties_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void style_table_column_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -199,14 +199,14 @@ void style_table_column_properties::docx_convert(oox::docx_conversion_context &
     std::wostream & strm = Context.output_stream();
 
 
-    if (style_table_column_properties_attlist_.style_column_width_)
+    if (attlist_.style_column_width_)
     {
 		double kf_max_width_ms =1.;
 
 		const page_layout_instance * pp = Context.root()->odf_context().pageLayoutContainer().page_layout_first();//
 		if (pp)
 		{
-			style_page_layout_properties_attlist & attr_page = pp->properties()->style_page_layout_properties_attlist_;
+			style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
 			if (attr_page.fo_page_width_)
 			{
 				int val =  0.5 + 20.0 * attr_page.fo_page_width_->get_value_unit(length::pt);
@@ -215,7 +215,7 @@ void style_table_column_properties::docx_convert(oox::docx_conversion_context &
 			}
 		}
 
-		int val = style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::pt);
+		int val = attlist_.style_column_width_->get_value_unit(length::pt);
 
 
 		//_CP_OPT(int) iUnormalWidth;
@@ -236,9 +236,9 @@ void style_table_column_properties::pptx_convert(oox::pptx_conversion_context &
     std::wostream & strm = Context.get_table_context().tableData();
 
 
-    if (style_table_column_properties_attlist_.style_column_width_)
+    if (attlist_.style_column_width_)
     {
-		int val = style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::emu);
+		int val = attlist_.style_column_width_->get_value_unit(length::emu);
 
         strm << L"<a:gridCol w=\"" << val << "\"/>";
     }
@@ -289,7 +289,7 @@ const wchar_t * style_table_cell_properties::name = L"table-cell-properties";
 
 void style_table_cell_properties::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    style_table_cell_properties_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void style_table_cell_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -351,7 +351,7 @@ const wchar_t * style_table_row_properties::name = L"table-row-properties";
 
 void style_table_row_properties::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    style_table_row_properties_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void style_table_row_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -368,7 +368,7 @@ void style_table_row_properties::add_child_element( xml::sax * Reader, const std
 
 void style_table_row_properties::docx_convert(oox::docx_conversion_context & Context) 
 {
-    style_table_row_properties_attlist_.docx_convert(Context);
+    attlist_.docx_convert(Context);
 }
 
 /////
@@ -654,7 +654,7 @@ void style_table_cell_properties_attlist::pptx_serialize(oox::pptx_conversion_co
 
 void style_table_cell_properties::docx_convert(oox::docx_conversion_context & Context) 
 {
-    style_table_cell_properties_attlist_.docx_convert(Context);    
+    attlist_.docx_convert(Context);    
 }
 
 void style_table_cell_properties_attlist::apply_from(const style_table_cell_properties_attlist & Other)

ASCOfficeOdfFile/src/odf/style_table_properties.h

@@ -89,7 +89,6 @@ public:
        
 };
 
-///         style:table-properties
 class style_table_properties : public office_element_impl<style_table_properties>
 {
 public:
@@ -101,19 +100,17 @@ public:
     CPDOCCORE_DEFINE_VISITABLE();
     virtual void docx_convert(oox::docx_conversion_context & Context) ;
 
-	table_format_properties & content() {return table_format_properties_;}
+	table_format_properties & content() {return content_;}
 
 private:
     virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
  
-    table_format_properties table_format_properties_;
-
+    table_format_properties content_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(style_table_properties);
 
-// style-table-column-properties-attlist
 class style_table_column_properties_attlist
 {
 public:
@@ -126,7 +123,6 @@ public:
 
 };
 
-///         style:table-column-properties
 class style_table_column_properties : public office_element_impl<style_table_column_properties>
 {
 public:
@@ -146,13 +142,12 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    style_table_column_properties_attlist style_table_column_properties_attlist_;
+    style_table_column_properties_attlist attlist_;
         
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(style_table_column_properties);
 
-// style-table-row-properties-attlist
 class style_table_row_properties_attlist
 {
 public:
@@ -161,7 +156,6 @@ public:
 	void docx_convert(oox::docx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context);
 
-public:
     _CP_OPT(odf_types::length)					style_row_height_;
     _CP_OPT(odf_types::length)					style_min_row_height_;
     _CP_OPT(bool)								style_use_optimal_row_height_;
@@ -171,7 +165,6 @@ public:
 
 };
 
-///         style:table-row-properties
 class style_table_row_properties : public office_element_impl<style_table_row_properties>
 {
 public:
@@ -189,14 +182,13 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    style_table_row_properties_attlist	style_table_row_properties_attlist_;
+    style_table_row_properties_attlist	attlist_;
     office_element_ptr					style_background_image_;
         
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(style_table_row_properties);
 
-// style-table-cell-properties-attlist
 class style_table_cell_properties_attlist
 {
 public:
@@ -207,7 +199,6 @@ public:
 
     void apply_from(const style_table_cell_properties_attlist & Other);
 
-public:
     odf_types::common_shadow_attlist			common_shadow_attlist_;
     odf_types::common_background_color_attlist	common_background_color_attlist_;
     odf_types::common_border_attlist			common_border_attlist_;
@@ -227,26 +218,21 @@ public:
     _CP_OPT(std::wstring)					style_cell_protect_;
     _CP_OPT(bool)							style_print_content_;
     _CP_OPT(unsigned int)					style_decimal_places_;
-    _CP_OPT(bool) style_repeat_content_;
-    _CP_OPT(bool) style_shrink_to_fit_;
+    _CP_OPT(bool)							style_repeat_content_;
+    _CP_OPT(bool)							style_shrink_to_fit_;
 
     _CP_OPT(odf_types::wrap_option)			fo_wrap_option_;
 };
 
-// style-table-cell-properties-elements
 class style_table_cell_properties_elements
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-private:
-     // 15.11.6
     office_element_ptr style_background_image_;
-    
 };
 
 
-///         style:table-cell-properties
 class style_table_cell_properties : public office_element_impl<style_table_cell_properties>
 {
 public:
@@ -264,8 +250,8 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    style_table_cell_properties_attlist style_table_cell_properties_attlist_;
-    office_element_ptr style_background_image_;
+    style_table_cell_properties_attlist attlist_;
+    office_element_ptr					style_background_image_;
         
 };
 

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -722,7 +722,6 @@ void style_footer_left::add_child_element( xml::sax * Reader, const std::wstring
     content().header_footer_content_.add_child_element(Reader, Ns, Name, getContext());
 }
 
-/// style:columns
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_columns::ns = L"style";
 const wchar_t * style_columns::name = L"columns";
@@ -745,7 +744,6 @@ void style_columns::add_child_element( xml::sax * Reader, const std::wstring & N
     }
 }
 
-/// style:column
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_column::ns = L"style";
 const wchar_t * style_column::name = L"column";
@@ -765,7 +763,6 @@ void style_column::add_child_element( xml::sax * Reader, const std::wstring & Ns
     CP_NOT_APPLICABLE_ELM();
 }
 
-/// style:column-sep
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_column_sep::ns = L"style";
 const wchar_t * style_column_sep::name = L":column-sep";
@@ -784,8 +781,6 @@ void style_column_sep::add_child_element( xml::sax * Reader, const std::wstring
     CP_NOT_APPLICABLE_ELM();
 }
 
-
-/// style:section-properties
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_section_properties::ns = L"style";
 const wchar_t * style_section_properties::name = L"section-properties";
@@ -811,7 +806,6 @@ void style_section_properties::add_child_element( xml::sax * Reader, const std::
     }
 }
 
-/// style:header-style
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_header_style::ns = L"style";
 const wchar_t * style_header_style::name = L"header-style";
@@ -837,7 +831,6 @@ void style_header_style::add_child_element( xml::sax * Reader, const std::wstrin
     }
 }
 
-/// style:footer-style
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_footer_style::ns = L"style";
 const wchar_t * style_footer_style::name = L"footer-style";
@@ -863,15 +856,12 @@ void style_footer_style::add_child_element( xml::sax * Reader, const std::wstrin
     }
 }
 
-
-/// style-page-layout-attlist
 void style_page_layout_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"style:name", style_name_, std::wstring(L""));
     CP_APPLY_ATTR(L"style:page-usage", style_page_usage_, page_usage(page_usage::All));    
 }
 
-/// style:page-layout
 //////////////////////////////////////////////////////////////////////////////////////////////////
 const wchar_t * style_page_layout::ns = L"style";
 const wchar_t * style_page_layout::name = L"page-layout";
@@ -906,16 +896,15 @@ void style_page_layout::add_child_element( xml::sax * Reader, const std::wstring
     }
 }
 
-// style-page-layout-properties-attlist
 void style_page_layout_properties_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
     CP_APPLY_ATTR(L"fo:page-width",		fo_page_width_);
     CP_APPLY_ATTR(L"fo:page-height",	fo_page_height_);
-    common_num_format_attlist_.add_attributes(Attributes);
-    common_num_format_prefix_suffix_attlist_.add_attributes(Attributes);
     CP_APPLY_ATTR(L"style:paper-tray-name",		style_paper_tray_name_);
     CP_APPLY_ATTR(L"style:print-orientation",	style_print_orientation_);
    
+    common_num_format_attlist_.add_attributes(Attributes);
+    common_num_format_prefix_suffix_attlist_.add_attributes(Attributes);
 	common_horizontal_margin_attlist_.add_attributes(Attributes);
     common_vertical_margin_attlist_.add_attributes(Attributes);
     common_margin_attlist_.add_attributes(Attributes);
@@ -947,34 +936,6 @@ void style_page_layout_properties_attlist::add_attributes( const xml::attributes
     CP_APPLY_ATTR(L"style:layout-grid-display",		style_layout_grid_display_);
 }
 
-/*
-Choice [0..6]
-[ ] w:headerReference     Header Reference
-[ ] w:footerReference     Footer Reference
-[ ] from group w:EG_SectPrContents  
-[ ] Sequence 
-[ ] w:footnotePr     Section-Wide Footnote Properties
-[ ] w:endnotePr     Section-Wide Endnote Properties
-[ ] w:type     Section Type
-[x] w:pgSz     Page Size
-[ ] w:pgMar     Page Margins
-[ ] w:paperSrc     Paper Source Information
-[ ] w:pgBorders     Page Borders
-[ ] w:lnNumType     Line Numbering Settings
-[ ] w:pgNumType     Page Numbering Settings
-[ ] w:cols     Column Definitions
-[ ] w:formProt     Only Allow Editing of Form Fields
-[ ] w:vAlign     Vertical Text Alignment on Page
-[ ] w:noEndnote     Suppress Endnotes In Document
-[ ] w:titlePg     Different First Page Headers and Footers
-[ ] w:textDirection     Text Flow Direction
-[ ] w:bidi     Right to Left Section Layout
-[ ] w:rtlGutter     Gutter on Right Side of Page
-[ ] w:docGrid     Document Grid
-[ ] w:printerSettings     Reference to Printer Settings Data
-[ ] w:sectPrChange     Revision Information for Section Properties
-*/
-
 namespace {
 
 std::wstring process_page_margin(const _CP_OPT(length_or_percent)	& Val, 
@@ -1012,7 +973,7 @@ void style_page_layout_properties_attlist::docx_convert_serialize(std::wostream
 				//Context.set_settings_property(odf_reader::_property(L"UnormalWidthPage",val));
 				val =31680;//22"
 			}
-			w_w = boost::lexical_cast<std::wstring>(val);
+			w_w = std::to_wstring(val);
 		}
 		if (fo_page_height_)
 		{
@@ -1199,7 +1160,7 @@ void style_page_layout_properties_attlist::pptx_convert(oox::pptx_conversion_con
 			h = fo_page_height_->get_value_unit(length::emu);
 			if (h < 914400) h = 914400;
 
-			w_h = boost::lexical_cast<std::wstring>(h);
+			w_h = std::to_wstring(h);
 		}
                 
         std::wstring w_orient = L"custom";
@@ -1259,18 +1220,18 @@ const wchar_t * style_page_layout_properties::name = L"page-layout-properties";
 
 void style_page_layout_properties::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    style_page_layout_properties_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void style_page_layout_properties::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-    style_page_layout_properties_elements_.add_child_element(Reader, Ns, Name, getContext());
+    elements_.add_child_element(Reader, Ns, Name, getContext());
 }
 
 bool style_page_layout_properties::docx_background_serialize(std::wostream & strm, oox::docx_conversion_context & Context, oox::_oox_fill & fill, int id)
 {
-	if (style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_ && 
-		style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_type() == background_color::Transparent)
+	if (attlist_.common_background_color_attlist_.fo_background_color_ && 
+		attlist_.common_background_color_attlist_.fo_background_color_->get_type() == background_color::Transparent)
 		return true; //??
     //прозрачный фон
 	
@@ -1280,8 +1241,8 @@ bool style_page_layout_properties::docx_background_serialize(std::wostream & str
 		{
 			std::wstring color = L"ffffff";
 			
-			if (style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_)
-				color = style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_color().get_hex_value();
+			if (attlist_.common_background_color_attlist_.fo_background_color_)
+				color = attlist_.common_background_color_attlist_.fo_background_color_->get_color().get_hex_value();
 			
 			CP_XML_ATTR(L"w:color", color);
 
@@ -1290,9 +1251,91 @@ bool style_page_layout_properties::docx_background_serialize(std::wostream & str
 	}
 	return true;
 }
+
+void style_page_layout_properties::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+}
+
+void style_page_layout_properties::xlsx_serialize(std::wostream & strm, oox::xlsx_conversion_context & Context)
+{
+	CP_XML_WRITER(strm)
+	{
+		odf_types::common_horizontal_margin_attlist		horizontal_margins	= attlist_.common_horizontal_margin_attlist_;
+		odf_types::common_vertical_margin_attlist		vertical_margins	= attlist_.common_vertical_margin_attlist_;
+		
+		if (horizontal_margins.fo_margin_left_	|| horizontal_margins.fo_margin_right_	||
+			vertical_margins.fo_margin_top_		|| vertical_margins.fo_margin_bottom_ )
+		{
+			//_CP_OPT(odf_types::length)  margin_top, margin_bottom;
+
+			//margin_top	= Context.get_header_footer_context().header();
+			//margin_bottom = Context.get_header_footer_context().footer();
+
+			CP_XML_NODE(L"pageMargins")
+			{
+				if (horizontal_margins.fo_margin_left_ && horizontal_margins.fo_margin_left_->get_type() == odf_types::length_or_percent::Length)
+					CP_XML_ATTR(L"left"		, horizontal_margins.fo_margin_left_->get_length().get_value_unit(odf_types::length::inch));
+				if (horizontal_margins.fo_margin_right_ && horizontal_margins.fo_margin_right_->get_type() == odf_types::length_or_percent::Length)
+					CP_XML_ATTR(L"right"	, horizontal_margins.fo_margin_right_->get_length().get_value_unit(odf_types::length::inch));
+				
+				if (vertical_margins.fo_margin_top_ && vertical_margins.fo_margin_top_->get_type() == odf_types::length_or_percent::Length)
+					CP_XML_ATTR(L"top"		, vertical_margins.fo_margin_top_->get_length().get_value_unit(odf_types::length::inch));
+				if (vertical_margins.fo_margin_bottom_ && vertical_margins.fo_margin_bottom_->get_type() == odf_types::length_or_percent::Length)
+					CP_XML_ATTR(L"bottom"	, vertical_margins.fo_margin_bottom_->get_length().get_value_unit(odf_types::length::inch));
+				
+				CP_XML_ATTR(L"header"	, vertical_margins.fo_margin_top_->get_length().get_value_unit(odf_types::length::inch));
+				CP_XML_ATTR(L"footer"	, vertical_margins.fo_margin_bottom_->get_length().get_value_unit(odf_types::length::inch));
+			}
+		}
+		if (attlist_.fo_page_width_ || attlist_.fo_page_height_ || attlist_.style_print_orientation_)
+		{
+			CP_XML_NODE(L"pageSetup")
+			{
+				double h = 0, w = 0;
+				if (attlist_.fo_page_width_)
+				{
+					w =  attlist_.fo_page_width_->get_value_unit(length::mm);
+					CP_XML_ATTR(L"paperWidth", (int)w);
+				}
+				if (attlist_.fo_page_height_)
+				{
+					h = attlist_.fo_page_height_->get_value_unit(length::mm);
+					CP_XML_ATTR(L"paperHeight", (int)h);
+				}
+				CP_XML_ATTR(L"paperUnits", L"mm");
+				if (attlist_.style_print_orientation_)
+				{
+					CP_XML_ATTR(L"orientation", *attlist_.style_print_orientation_);
+				}
+			}
+		}
+		if (elements_.style_background_image_)
+		{
+			oox::_oox_fill fill;
+				
+			Compute_GraphicFill(attlist_.common_draw_fill_attlist_, elements_.style_background_image_, Context.root()->odf_context().drawStyles(), fill);
+			if (fill.bitmap)
+			{
+				if ( fill.bitmap->rId.empty())
+				{
+					std::wstring href	= fill.bitmap->xlink_href_;
+					fill.bitmap->rId	= Context.get_mediaitems().add_or_find(href, oox::typeImage, fill.bitmap->isInternal, href);
+
+					Context.get_drawing_context().get_drawings()->add(fill.bitmap->isInternal, fill.bitmap->rId, href, oox::typeImage, true);
+				}
+
+				CP_XML_NODE(L"picture")
+				{
+					CP_XML_ATTR(L"r:id", fill.bitmap->rId );
+				}		
+			}		
+		}
+	}
+}
+
 void style_page_layout_properties::docx_convert_serialize(std::wostream & strm, oox::docx_conversion_context & Context)
 {
-	style_columns * columns = dynamic_cast<style_columns *>( style_page_layout_properties_elements_.style_columns_.get());
+	style_columns * columns = dynamic_cast<style_columns *>( elements_.style_columns_.get());
 
 	CP_XML_WRITER(strm)
 	{
@@ -1325,14 +1368,14 @@ void style_page_layout_properties::docx_convert_serialize(std::wostream & strm,
 	
 			oox::section_context::_section & section = Context.get_section_context().get();
 
-			style_page_layout_properties_attlist_.docx_convert_serialize(strm, Context, section.margin_left_, section.margin_right_);
+			attlist_.docx_convert_serialize(strm, Context, section.margin_left_, section.margin_right_);
 			//todooo при появлении еще накладок - переписать !!
 		}
 	}
 }
 void style_page_layout_properties::pptx_convert(oox::pptx_conversion_context & Context)
 {
-    style_page_layout_properties_attlist_.pptx_convert(Context);        
+    attlist_.pptx_convert(Context);        
 }
 
 
@@ -1363,10 +1406,10 @@ void style_page_layout_properties_elements::add_child_element( xml::sax * Reader
 ////////////////////////////////////////////////////////////////////////////////////////////////// 
 void style_master_page_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"style:name", style_name_);
-    CP_APPLY_ATTR(L"style:display-name", style_display_name_);
-    CP_APPLY_ATTR(L"style:page-layout-name", style_page_layout_name_);
-    CP_APPLY_ATTR(L"draw:style-name", draw_style_name_);
+    CP_APPLY_ATTR(L"style:name",			style_name_);
+    CP_APPLY_ATTR(L"style:display-name",	style_display_name_);
+    CP_APPLY_ATTR(L"style:page-layout-name",style_page_layout_name_);
+    CP_APPLY_ATTR(L"draw:style-name",		draw_style_name_);
     CP_APPLY_ATTR(L"style:next-style-name", style_next_style_name_);
 }
 
@@ -1382,7 +1425,7 @@ std::wostream & style_master_page::text_to_stream(std::wostream & _Wostream) con
 
 void style_master_page::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    style_master_page_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void style_master_page::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -1457,9 +1500,9 @@ int style_master_page::find_placeHolderIndex(presentation_class::type placeHolde
 
 void style_master_page::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	if (style_master_page_attlist_.draw_style_name_)
+	if (attlist_.draw_style_name_)
 	{
-		std::wstring style_name = style_master_page_attlist_.draw_style_name_.get();
+		std::wstring style_name = attlist_.draw_style_name_.get();
 		style_instance * style_inst = Context.root()->odf_context().styleContainer().style_by_name(style_name,style_family::DrawingPage,true);
 		
 		if ((style_inst) && (style_inst->content()))

ASCOfficeOdfFile/src/odf/styles.h

@@ -442,7 +442,6 @@ public:
     _CP_OPT(std::wstring)	style_next_style_name_;
 };
 
-//  style:master-page
 class style_master_page;
 typedef boost::shared_ptr<style_master_page> style_master_page_ptr;
 
@@ -465,7 +464,7 @@ private:
 public:
 	int find_placeHolderIndex(odf_types::presentation_class::type placeHolder,int & last_idx);
    
-	style_master_page_attlist	style_master_page_attlist_;
+	style_master_page_attlist	attlist_;
 
     office_element_ptr			style_header_;  
     office_element_ptr			style_header_left_; 
@@ -975,15 +974,17 @@ public:
     static const ElementType type = typeStylePageLayout;
     CPDOCCORE_DEFINE_VISITABLE();
 
-    void docx_convert_serialize(std::wostream & strm, oox::docx_conversion_context & Context);
-    void pptx_convert(oox::pptx_conversion_context & Context);
+    void docx_convert_serialize	(std::wostream & strm, oox::docx_conversion_context & Context);
+    void pptx_convert			(oox::pptx_conversion_context & Context);
+    void xlsx_convert			(oox::xlsx_conversion_context & Context);
     
 	bool docx_background_serialize(std::wostream & strm, oox::docx_conversion_context & Context, oox::_oox_fill & fill, int id);
+	void xlsx_serialize(std::wostream & strm, oox::xlsx_conversion_context & Context);
 
     style_page_layout_properties() { }
 
-    style_page_layout_properties_attlist	style_page_layout_properties_attlist_;
-    style_page_layout_properties_elements	style_page_layout_properties_elements_;
+    style_page_layout_properties_attlist	attlist_;
+    style_page_layout_properties_elements	elements_;
 
 private:
 

ASCOfficeOdfFile/src/odf/table_pptx.cpp

@@ -81,7 +81,7 @@ void table_table_row::pptx_convert(oox::pptx_conversion_context & Context)
 	
 		if ((inst) && (inst->content()) && (inst->content()->get_style_table_row_properties()))
 		{
-			style_table_row_properties_attlist & row_attlist = inst->content()->get_style_table_row_properties()->style_table_row_properties_attlist_;
+			style_table_row_properties_attlist & row_attlist = inst->content()->get_style_table_row_properties()->attlist_;
 			if (row_attlist.style_row_height_)
 			{
 				height = (int)( 0.5 +row_attlist.style_row_height_->get_value_unit(length::emu) );

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -120,12 +120,12 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
     if ((rowStyle) && (rowStyle->content()))
 	{
 		const odf_reader::style_table_row_properties * prop = rowStyle->content()->get_style_table_row_properties();
-		if ((prop) && (prop->style_table_row_properties_attlist_.style_row_height_))
+		if ((prop) && (prop->attlist_.style_row_height_))
 		{
-			row_height = prop->style_table_row_properties_attlist_.style_row_height_->get_value_unit(odf_types::length::pt);
+			row_height = prop->attlist_.style_row_height_->get_value_unit(odf_types::length::pt);
 
-			if ((prop->style_table_row_properties_attlist_.style_use_optimal_row_height_) && 
-						(*prop->style_table_row_properties_attlist_.style_use_optimal_row_height_==true))
+			if ((prop->attlist_.style_use_optimal_row_height_) && 
+						(*prop->attlist_.style_use_optimal_row_height_==true))
 			{
 				//автоматическая подстройка высоты.
 				//нету в оох
@@ -478,11 +478,11 @@ void table_table_column::xlsx_convert(oox::xlsx_conversion_context & Context)
                     {
                         if (const style_table_column_properties * prop = inst->content()->get_style_table_column_properties())
                         {  
-                            if (prop->style_table_column_properties_attlist_.style_column_width_)
+                            if (prop->attlist_.style_column_width_)
                             {
-                                pt_width = prop->style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::pt);                        
-                                cm_width = prop->style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::cm);        
-								in_width = prop->style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::inch);
+                                pt_width = prop->attlist_.style_column_width_->get_value_unit(length::pt);                        
+                                cm_width = prop->attlist_.style_column_width_->get_value_unit(length::cm);        
+								in_width = prop->attlist_.style_column_width_->get_value_unit(length::inch);
 
                                 if (collapsed)
                                 {
@@ -492,7 +492,7 @@ void table_table_column::xlsx_convert(oox::xlsx_conversion_context & Context)
                                 const double pixDpi = in_width * 96.;                
                                 width = pixToSize(pixDpi, Context.getMaxDigitSize().first); 
 
-								//const double width = cmToChars(prop->style_table_column_properties_attlist_.style_column_width_->get_value_unit(length::cm));
+								//const double width = cmToChars(prop->attlist_.style_column_width_->get_value_unit(length::cm));
                               
 								// see ECMA-376 page 1768
                                 if (in_width > 0)

ASCOfficeOdfFileW/source/OdfFormat/Shapes/odf_shape_mapping.h

@@ -65,7 +65,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L"mso-spt36"					,  7},			//	shapetypeBentConnector5,
 	{	L"mso-spt90"					,  7},			//	shapetypeBentUpArrow,
 	{	L"quad-bevel"					,  7},			//	shapetypeBevel,
-	{	L"block-arc"					,  7},			//	shapetypeBlockArc,
+	{	L""								,  7},			//	shapetypeBlockArc,
 	{	L"mso-spt49"					,  7},			//	shapetypeBorderCallout1,
 	{	L"mso-spt50"					,  7},			//	shapetypeBorderCallout2,
 	{	L"mso-spt51"					,  7},			//	shapetypeBorderCallout3,
@@ -98,7 +98,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
 	{	L""								,  7},			//	shapetypeDiagStripe,
 	{	L"diamond"						,  7},			//	shapetypeDiamond,
 	{	L""								,  7},			//	shapetypeDodecagon,
-	{	L"ring"							,  7},			//	shapetypeDonut,
+	{	L""								,  7},			//	shapetypeDonut,
 	{	L""								,  7},			//	shapetypeDoubleWave,
 	{	L"down-arrow"					,  7},			//	shapetypeDownArrow,
 	{	L"down-arrow-callout"			,  7},			//	shapetypeDownArrowCallout,

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeArrows.h

@@ -32,7 +32,7 @@
 #include "../oox_shape_defines.h"
 	//	+shapetypeLeftCircularArrow,
 	//	shapetypeLeftRightCircularArrow,
-	//	shapetypeSwooshArrow,
+	//	+shapetypeSwooshArrow,
 	//	+shapetypeCircularArrow
 namespace cpdoccore 
 {
@@ -43,158 +43,243 @@ public:
 	{
 		odf_type_name	=L"ooxml-leftCircularArrow";
 
-		enhanced_path	= L"M 529769 128373 L 570534 225808 A ?f91 ?f92 ?f93 ?f94 570534 225808 ?f88 ?f90  W ?f95 ?f96 ?f97 ?f98 570534 225808 ?f88 ?f90 L 246425 854941 139301 967187 5691 907641 74093 892667 A ?f138 ?f139 ?f140 ?f141 74093 892667 ?f135 ?f137  W ?f142 ?f143 ?f144 ?f145 74093 892667 ?f135 ?f137 Z N";
-		text_areas		= L"?f48 ?f50 ?f49 ?f51";
-		glue_points		= L"?f40 ?f41 ?f42 ?f43 ?f44 ?f45 ?f46 ?f47";
-		view_box		= L"0 0 1637004 1637004";
+		enhanced_path	= L"M ?f63 ?f64 L ?f69 ?f70 G ?f13 ?f14 ?f210 ?f211 L ?f185 ?f186 ?f57 ?f58 ?f183 ?f184 ?f126 ?f127 G ?f10 ?f12 ?f212 ?f213 Z N";
+		text_areas		= L"?f206 ?f208 ?f207 ?f209";
+		modifiers		= L"10980 1142322 6300000 18900000 12500";
+		view_box		= L"0 0 0 0";
 		
-		add(L"f0", L"10800000");
-		add(L"f1", L"5400000");
-		add(L"f2", L"left");
-		add(L"f3", L"right");
-		add(L"f4", L"top");
-		add(L"f5", L"bottom");
-		add(L"f6", L"?f5 - ?f4");
-		add(L"f7", L"?f3 - ?f2");
-		add(L"f8", L"5419351 / 1725033");
-		add(L"f9", L"180");
-		add(L"f10", L"?f7 / 1637004");
-		add(L"f11", L"?f6 / 1637004");
-		add(L"f12", L"139301 - 818502");
-		add(L"f13", L"967187 - 818502");
-		add(L"f14", L"sqrt(?f12 * ?f12 + ?f13 * ?f13 + 0 * 0)");
-		add(L"f15", L"atan2(?f12, ?f13)");
-		add(L"f16", L"?f15 + ?f1");
-		add(L"f17", L"?f16 * ?f9 / ?f0");
-		add(L"f18", L"0 - ?f17");
-		add(L"f19", L"529769 - 818502");
-		add(L"f20", L"128373 - 818502");
-		add(L"f21", L"sqrt(?f19 * ?f19 + ?f20 * ?f20 + 0 * 0)");
-		add(L"f22", L"atan2(?f19, ?f20)");
-		add(L"f23", L"?f22 + ?f1");
-		add(L"f24", L"?f23 * ?f9 / ?f0");
-		add(L"f25", L"0 - ?f24");
-		add(L"f26", L"74093 - 818502");
-		add(L"f27", L"892667 - 818502");
-		add(L"f28", L"sqrt(?f26 * ?f26 + ?f27 * ?f27 + 0 * 0)");
-		add(L"f29", L"atan2(?f26, ?f27)");
-		add(L"f30", L"?f29 + ?f1");
-		add(L"f31", L"?f30 * ?f9 / ?f0");
-		add(L"f32", L"0 - ?f31");
-		add(L"f33", L"246425 - 818502");
-		add(L"f34", L"854941 - 818502");
-		add(L"f35", L"sqrt(?f33 * ?f33 + ?f34 * ?f34 + 0 * 0)");
-		add(L"f36", L"atan2(?f33, ?f34)");
-		add(L"f37", L"?f36 + ?f1");
-		add(L"f38", L"?f37 * ?f9 / ?f0");
-		add(L"f39", L"0 - ?f38");
-		add(L"f40", L"550151 / ?f10");
-		add(L"f41", L"177091 / ?f11");
-		add(L"f42", L"5691 / ?f10");
-		add(L"f43", L"907641 / ?f11");
-		add(L"f44", L"139301 / ?f10");
-		add(L"f45", L"967187 / ?f11");
-		add(L"f46", L"246425 / ?f10");
-		add(L"f47", L"854941 / ?f11");
-		add(L"f48", L"289519 / ?f10");
-		add(L"f49", L"1347485 / ?f10");
-		add(L"f50", L"289519 / ?f11");
-		add(L"f51", L"1347485 / ?f11");
-		add(L"f52", L"21550000 - -4313128");
-		add(L"f53", L"if(?f52, -4313128, 21550000)");
-		add(L"f54", L"-21550000 - ?f53");
-		add(L"f55", L"if(?f54, -21550000, ?f53)");
-		add(L"f56", L"14837806 + ?f55");
-		add(L"f57", L"14837806 + ?f1");
-		add(L"f58", L"?f57 * ?f8 / ?f0");
-		add(L"f59", L"0 - ?f58");
-		add(L"f60", L"cos(?f59)");
-		add(L"f61", L"0 - ?f60");
-		add(L"f62", L"?f61 * 642475");
-		add(L"f63", L"sin(?f59)");
-		add(L"f64", L"0 - ?f63");
-		add(L"f65", L"?f64 * 642475");
-		add(L"f66", L"sqrt(?f62 * ?f62 + ?f65 * ?f65 + 0 * 0)");
-		add(L"f67", L"642475 * 642475 / ?f66");
-		add(L"f68", L"?f64 * ?f67");
-		add(L"f69", L"570534 - ?f68");
-		add(L"f70", L"?f61 * ?f67");
-		add(L"f71", L"225808 - ?f70");
-		add(L"f72", L"?f69 - 642475");
-		add(L"f73", L"?f71 - 642475");
-		add(L"f74", L"?f69 + 642475");
-		add(L"f75", L"?f71 + 642475");
-		add(L"f76", L"?f56 + ?f1");
-		add(L"f77", L"?f76 * ?f8 / ?f0");
-		add(L"f78", L"0 - ?f77");
-		add(L"f79", L"cos(?f78)");
-		add(L"f80", L"0 - ?f79");
-		add(L"f81", L"?f80 * 642475");
-		add(L"f82", L"sin(?f78)");
-		add(L"f83", L"0 - ?f82");
-		add(L"f84", L"?f83 * 642475");
-		add(L"f85", L"sqrt(?f81 * ?f81 + ?f84 * ?f84 + 0 * 0)");
-		add(L"f86", L"642475 * 642475 / ?f85");
-		add(L"f87", L"?f83 * ?f86");
-		add(L"f88", L"?f69 + ?f87");
-		add(L"f89", L"?f80 * ?f86");
-		add(L"f90", L"?f71 + ?f89");
-		add(L"f91", L"if(?f55, 570534, ?f72)");
-		add(L"f92", L"if(?f55, 225808, ?f73)");
-		add(L"f93", L"if(?f55, 570534, ?f74)");
-		add(L"f94", L"if(?f55, 225808, ?f75)");
-		add(L"f95", L"if(?f55, ?f72, ?f88)");
-		add(L"f96", L"if(?f55, ?f73, ?f90)");
-		add(L"f97", L"if(?f55, ?f74, ?f88)");
-		add(L"f98", L"if(?f55, ?f75, ?f90)");
-		add(L"f99", L"21550000 - 4379179");
-		add(L"f100", L"if(?f99, 4379179, 21550000)");
-		add(L"f101", L"-21550000 - ?f100");
-		add(L"f102", L"if(?f101, -21550000, ?f100)");
-		add(L"f103", L"10458627 + ?f102");
-		add(L"f104", L"10458627 + ?f1");
-		add(L"f105", L"?f104 * ?f8 / ?f0");
-		add(L"f106", L"0 - ?f105");
-		add(L"f107", L"cos(?f106)");
-		add(L"f108", L"0 - ?f107");
-		add(L"f109", L"?f108 * 748094");
-		add(L"f110", L"sin(?f106)");
-		add(L"f111", L"0 - ?f110");
-		add(L"f112", L"?f111 * 748094");
-		add(L"f113", L"sqrt(?f109 * ?f109 + ?f112 * ?f112 + 0 * 0)");
-		add(L"f114", L"748094 * 748094 / ?f113");
-		add(L"f115", L"?f111 * ?f114");
-		add(L"f116", L"74093 - ?f115");
-		add(L"f117", L"?f108 * ?f114");
-		add(L"f118", L"892667 - ?f117");
-		add(L"f119", L"?f116 - 748094");
-		add(L"f120", L"?f118 - 748094");
-		add(L"f121", L"?f116 + 748094");
-		add(L"f122", L"?f118 + 748094");
-		add(L"f123", L"?f103 + ?f1");
-		add(L"f124", L"?f123 * ?f8 / ?f0");
-		add(L"f125", L"0 - ?f124");
-		add(L"f126", L"cos(?f125)");
-		add(L"f127", L"0 - ?f126");
-		add(L"f128", L"?f127 * 748094");
-		add(L"f129", L"sin(?f125)");
-		add(L"f130", L"0 - ?f129");
-		add(L"f131", L"?f130 * 748094");
-		add(L"f132", L"sqrt(?f128 * ?f128 + ?f131 * ?f131 + 0 * 0)");
-		add(L"f133", L"748094 * 748094 / ?f132");
-		add(L"f134", L"?f130 * ?f133");
-		add(L"f135", L"?f116 + ?f134");
-		add(L"f136", L"?f127 * ?f133");
-		add(L"f137", L"?f118 + ?f136");
-		add(L"f138", L"if(?f102, 74093, ?f119)");
-		add(L"f139", L"if(?f102, 892667, ?f120)");
-		add(L"f140", L"if(?f102, 74093, ?f121)");
-		add(L"f141", L"if(?f102, 892667, ?f122)");
-		add(L"f142", L"if(?f102, ?f119, ?f135)");
-		add(L"f143", L"if(?f102, ?f120, ?f137)");
-		add(L"f144", L"if(?f102, ?f121, ?f135)");
-		add(L"f145", L"if(?f102, ?f122, ?f137)");
+		add(L"f0", L"if(0-$4 ,0,if(25000-$4 ,$4 ,25000))");
+		add(L"f1", L"?f0 *2/1");
+		add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
+		add(L"f3", L"if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))");
+		add(L"f4", L"if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))");
+		add(L"f5", L"min(logwidth,logheight)");
+		add(L"f6", L"?f5 *?f2 /100000");
+		add(L"f7", L"?f5 *?f0 /100000");
+		add(L"f8", L"?f6 *1/2");
+		add(L"f9", L"logwidth/2");
+		add(L"f10", L"?f9 +?f8 -?f7 ");
+		add(L"f11", L"logheight/2");
+		add(L"f12", L"?f11 +?f8 -?f7 ");
+		add(L"f13", L"?f10 +0-?f6 ");
+		add(L"f14", L"?f12 +0-?f6 ");
+		add(L"f15", L"?f13 +?f8 -0");
+		add(L"f16", L"?f14 +?f8 -0");
+		add(L"f17", L"?f15 *sin(pi*(?f3 )/10800000)");
+		add(L"f18", L"?f16 *cos(pi*(?f3 )/10800000)");
+		add(L"f19", L"?f15 *(cos(atan2(?f17 ,?f18 )))");
+		add(L"f20", L"?f16 *(sin(atan2(?f17 ,?f18 )))");
+		add(L"f21", L"logwidth/2");
+		add(L"f22", L"?f21 +?f19 -0");
+		add(L"f23", L"logheight/2");
+		add(L"f24", L"?f23 +?f20 -0");
+		add(L"f25", L"min(?f13 ,?f14 )");
+		add(L"f26", L"?f19 *?f19 /1");
+		add(L"f27", L"?f20 *?f20 /1");
+		add(L"f28", L"?f25 *?f25 /1");
+		add(L"f29", L"?f26 +0-?f28 ");
+		add(L"f30", L"?f27 +0-?f28 ");
+		add(L"f31", L"?f29 *?f30 /?f26 ");
+		add(L"f32", L"?f31 *1/?f27 ");
+		add(L"f33", L"1+0-?f32 ");
+		add(L"f34", L"sqrt(?f33 )");
+		add(L"f35", L"?f29 *1/?f19 ");
+		add(L"f36", L"?f35 *1/?f20 ");
+		add(L"f37", L"(1+?f34 )/?f36 ");
+		add(L"f38", L"(10800000*atan2(?f37 ,1))/pi");
+		add(L"f39", L"?f38 +21600000-0");
+		add(L"f40", L"if(?f38 ,?f38 ,?f39 )");
+		add(L"f41", L"?f40 +0-?f3 ");
+		add(L"f42", L"?f41 +21600000-0");
+		add(L"f43", L"if(?f41 ,?f41 ,?f42 )");
+		add(L"f44", L"?f43 +0-10800000");
+		add(L"f45", L"?f43 +0-21600000");
+		add(L"f46", L"if(?f44 ,?f45 ,?f43 )");
+		add(L"f47", L"abs(?f46 )");
+		add(L"f48", L"?f47 *-1/1");
+		add(L"f49", L"abs($1 )");
+		add(L"f50", L"?f49 *-1/1");
+		add(L"f51", L"if(?f48 -?f50 ,?f48 ,if(0-?f50 ,?f50 ,0))");
+		add(L"f52", L"?f3 +?f51 -0");
+		add(L"f53", L"?f15 *sin(pi*(?f52 )/10800000)");
+		add(L"f54", L"?f16 *cos(pi*(?f52 )/10800000)");
+		add(L"f55", L"?f15 *(cos(atan2(?f53 ,?f54 )))");
+		add(L"f56", L"?f16 *(sin(atan2(?f53 ,?f54 )))");
+		add(L"f57", L"?f21 +?f55 -0");
+		add(L"f58", L"?f23 +?f56 -0");
+		add(L"f59", L"?f10 *sin(pi*(?f4 )/10800000)");
+		add(L"f60", L"?f12 *cos(pi*(?f4 )/10800000)");
+		add(L"f61", L"?f10 *(cos(atan2(?f59 ,?f60 )))");
+		add(L"f62", L"?f12 *(sin(atan2(?f59 ,?f60 )))");
+		add(L"f63", L"?f21 +?f61 -0");
+		add(L"f64", L"?f23 +?f62 -0");
+		add(L"f65", L"?f13 *sin(pi*(?f4 )/10800000)");
+		add(L"f66", L"?f14 *cos(pi*(?f4 )/10800000)");
+		add(L"f67", L"?f13 *(cos(atan2(?f65 ,?f66 )))");
+		add(L"f68", L"?f14 *(sin(atan2(?f65 ,?f66 )))");
+		add(L"f69", L"?f21 +?f67 -0");
+		add(L"f70", L"?f23 +?f68 -0");
+		add(L"f71", L"?f7 *cos(pi*(?f52 )/10800000)");
+		add(L"f72", L"?f7 *sin(pi*(?f52 )/10800000)");
+		add(L"f73", L"?f22 +?f71 -0");
+		add(L"f74", L"?f24 +?f72 -0");
+		add(L"f75", L"?f7 *cos(pi*(?f52 )/10800000)");
+		add(L"f76", L"?f7 *sin(pi*(?f52 )/10800000)");
+		add(L"f77", L"?f22 +0-?f75 ");
+		add(L"f78", L"?f24 +0-?f76 ");
+		add(L"f79", L"?f77 +0-?f21 ");
+		add(L"f80", L"?f78 +0-?f23 ");
+		add(L"f81", L"?f73 +0-?f21 ");
+		add(L"f82", L"?f74 +0-?f23 ");
+		add(L"f83", L"min(?f10 ,?f12 )");
+		add(L"f84", L"?f79 *?f83 /?f10 ");
+		add(L"f85", L"?f80 *?f83 /?f12 ");
+		add(L"f86", L"?f81 *?f83 /?f10 ");
+		add(L"f87", L"?f82 *?f83 /?f12 ");
+		add(L"f88", L"?f86 +0-?f84 ");
+		add(L"f89", L"?f87 +0-?f85 ");
+		add(L"f90", L"sqrt(?f88 *?f88 +?f89 *?f89 +0*0)");
+		add(L"f91", L"?f84 *?f87 /1");
+		add(L"f92", L"?f86 *?f85 /1");
+		add(L"f93", L"?f91 +0-?f92 ");
+		add(L"f94", L"?f83 *?f83 /1");
+		add(L"f95", L"?f90 *?f90 /1");
+		add(L"f96", L"?f94 *?f95 /1");
+		add(L"f97", L"?f93 *?f93 /1");
+		add(L"f98", L"?f96 +0-?f97 ");
+		add(L"f99", L"max(?f98 ,0)");
+		add(L"f100", L"sqrt(?f99 )");
+		add(L"f101", L"?f89 *-1/1");
+		add(L"f102", L"if(?f101 ,-1,1)");
+		add(L"f103", L"?f102 *?f88 /1");
+		add(L"f104", L"?f103 *?f100 /1");
+		add(L"f105", L"?f93 *?f89 /1");
+		add(L"f106", L"(?f105 +?f104 )/?f95 ");
+		add(L"f107", L"?f105 +0-?f104 ");
+		add(L"f108", L"?f107 *1/?f95 ");
+		add(L"f109", L"abs(?f89 )");
+		add(L"f110", L"?f109 *?f100 /1");
+		add(L"f111", L"?f93 *?f88 /-1");
+		add(L"f112", L"(?f111 +?f110 )/?f95 ");
+		add(L"f113", L"?f111 +0-?f110 ");
+		add(L"f114", L"?f113 *1/?f95 ");
+		add(L"f115", L"?f86 +0-?f106 ");
+		add(L"f116", L"?f86 +0-?f108 ");
+		add(L"f117", L"?f87 +0-?f112 ");
+		add(L"f118", L"?f87 +0-?f114 ");
+		add(L"f119", L"sqrt(?f115 *?f115 +?f117 *?f117 +0*0)");
+		add(L"f120", L"sqrt(?f116 *?f116 +?f118 *?f118 +0*0)");
+		add(L"f121", L"?f120 +0-?f119 ");
+		add(L"f122", L"if(?f121 ,?f106 ,?f108 )");
+		add(L"f123", L"if(?f121 ,?f112 ,?f114 )");
+		add(L"f124", L"?f122 *?f10 /?f83 ");
+		add(L"f125", L"?f123 *?f12 /?f83 ");
+		add(L"f126", L"?f21 +?f124 -0");
+		add(L"f127", L"?f23 +?f125 -0");
+		add(L"f128", L"?f79 *?f25 /?f13 ");
+		add(L"f129", L"?f80 *?f25 /?f14 ");
+		add(L"f130", L"?f81 *?f25 /?f13 ");
+		add(L"f131", L"?f82 *?f25 /?f14 ");
+		add(L"f132", L"?f130 +0-?f128 ");
+		add(L"f133", L"?f131 +0-?f129 ");
+		add(L"f134", L"sqrt(?f132 *?f132 +?f133 *?f133 +0*0)");
+		add(L"f135", L"?f128 *?f131 /1");
+		add(L"f136", L"?f130 *?f129 /1");
+		add(L"f137", L"?f135 +0-?f136 ");
+		add(L"f138", L"?f25 *?f25 /1");
+		add(L"f139", L"?f134 *?f134 /1");
+		add(L"f140", L"?f138 *?f139 /1");
+		add(L"f141", L"?f137 *?f137 /1");
+		add(L"f142", L"?f140 +0-?f141 ");
+		add(L"f143", L"max(?f142 ,0)");
+		add(L"f144", L"sqrt(?f143 )");
+		add(L"f145", L"?f102 *?f132 /1");
+		add(L"f146", L"?f145 *?f144 /1");
+		add(L"f147", L"?f137 *?f133 /1");
+		add(L"f148", L"(?f147 +?f146 )/?f139 ");
+		add(L"f149", L"?f147 +0-?f146 ");
+		add(L"f150", L"?f149 *1/?f139 ");
+		add(L"f151", L"abs(?f133 )");
+		add(L"f152", L"?f151 *?f144 /1");
+		add(L"f153", L"?f137 *?f132 /-1");
+		add(L"f154", L"(?f153 +?f152 )/?f139 ");
+		add(L"f155", L"?f153 +0-?f152 ");
+		add(L"f156", L"?f155 *1/?f139 ");
+		add(L"f157", L"?f128 +0-?f148 ");
+		add(L"f158", L"?f128 +0-?f150 ");
+		add(L"f159", L"?f129 +0-?f154 ");
+		add(L"f160", L"?f129 +0-?f156 ");
+		add(L"f161", L"sqrt(?f157 *?f157 +?f159 *?f159 +0*0)");
+		add(L"f162", L"sqrt(?f158 *?f158 +?f160 *?f160 +0*0)");
+		add(L"f163", L"?f162 +0-?f161 ");
+		add(L"f164", L"if(?f163 ,?f148 ,?f150 )");
+		add(L"f165", L"if(?f163 ,?f154 ,?f156 )");
+		add(L"f166", L"?f164 *?f13 /?f25 ");
+		add(L"f167", L"?f165 *?f14 /?f25 ");
+		add(L"f168", L"?f21 +?f166 -0");
+		add(L"f169", L"?f23 +?f167 -0");
+		add(L"f170", L"(10800000*atan2(?f167 ,?f166 ))/pi");
+		add(L"f171", L"?f170 +21600000-0");
+		add(L"f172", L"if(?f170 ,?f170 ,?f171 )");
+		add(L"f173", L"?f4 +0-?f172 ");
+		add(L"f174", L"?f173 +21600000-0");
+		add(L"f175", L"if(?f173 ,?f173 ,?f174 )");
+		add(L"f176", L"?f172 +?f175 -0");
+		add(L"f177", L"0+0-?f175 ");
+		add(L"f178", L"?f126 +0-?f168 ");
+		add(L"f179", L"?f127 +0-?f169 ");
+		add(L"f180", L"sqrt(?f178 *?f178 +?f179 *?f179 +0*0)");
+		add(L"f181", L"?f180 *1/2");
+		add(L"f182", L"?f181 +0-?f7 ");
+		add(L"f183", L"if(?f182 ,?f126 ,?f73 )");
+		add(L"f184", L"if(?f182 ,?f127 ,?f74 )");
+		add(L"f185", L"if(?f182 ,?f168 ,?f77 )");
+		add(L"f186", L"if(?f182 ,?f169 ,?f78 )");
+		add(L"f187", L"(10800000*atan2(?f125 ,?f124 ))/pi");
+		add(L"f188", L"?f187 +21600000-0");
+		add(L"f189", L"if(?f187 ,?f187 ,?f188 )");
+		add(L"f190", L"?f189 +0-?f4 ");
+		add(L"f191", L"?f190 +0-21600000");
+		add(L"f192", L"if(?f190 ,?f191 ,?f190 )");
+		add(L"f193", L"?f4 +?f192 -0");
+		add(L"f194", L"0+0-?f192 ");
+		add(L"f195", L"?f15 *sin(pi*(?f4 )/10800000)");
+		add(L"f196", L"?f16 *cos(pi*(?f4 )/10800000)");
+		add(L"f197", L"?f15 *(cos(atan2(?f195 ,?f196 )))");
+		add(L"f198", L"?f16 *(sin(atan2(?f195 ,?f196 )))");
+		add(L"f199", L"?f21 +?f197 -0");
+		add(L"f200", L"?f23 +?f198 -0");
+		add(L"f201", L"?f4 +5400000-0");
+		add(L"f202", L"?f52 +0-5400000");
+		add(L"f203", L"?f52 +10800000-0");
+		add(L"f204", L"?f10 *cos(pi*(2700000)/10800000)");
+		add(L"f205", L"?f12 *sin(pi*(2700000)/10800000)");
+		add(L"f206", L"?f21 +0-?f204 ");
+		add(L"f207", L"?f21 +?f204 -0");
+		add(L"f208", L"?f23 +0-?f205 ");
+		add(L"f209", L"?f23 +?f205 -0");
+		add(L"f210", L"(?f176 )/60000.0");
+		add(L"f211", L"(?f177 )/60000.0");
+		add(L"f212", L"(?f193 )/60000.0");
+		add(L"f213", L"(?f194 )/60000.0");
 /////////////////////////////////////////////////////////
+		_handle h;
+
+		h.position = L"?f57 ?f58";
+		handles.push_back(h);
+
+ 		h.position = L"?f63 ?f64";
+		handles.push_back(h);
+
+ 		h.position = L"?f126 ?f127";
+		h.r_minimum = L"0";
+		h.r_maximum = L"?f1";
+		handles.push_back(h);
+
+ 		h.position = L"?f77 ?f78";
+		h.r_minimum = L"0";
+		h.r_maximum = L"25000";
+		handles.push_back(h);
 	}
 };
 class oox_shape_CircularArrow : public oox_shape
@@ -202,11 +287,12 @@ class oox_shape_CircularArrow : public oox_shape
 public:
 	oox_shape_CircularArrow()
 	{
-		odf_type_name	=L"ooxml-circularArrow";
+		odf_type_name	= L"ooxml-circularArrow";
 
-		enhanced_path	= L"M ?f60 ?f61 L ?f172 ?f173 ?f54 ?f55 ?f174 ?f175 ?f159 ?f160 Z N";
+		enhanced_path	= L"M ?f60 ?f61 G ?f10 ?f12 ?f197 ?f198 L ?f172 ?f173 ?f54 ?f55 ?f174 ?f175 ?f159 ?f160 G ?f13 ?f14 ?f199 ?f200 Z N";
 		text_areas		= L"?f193 ?f195 ?f194 ?f196";
-		modifiers		= L"5085 327528 8671970 1800502 5932";
+		modifiers		= L"12500 515062 20457681 17744048 18489";
+		view_box		= L"0 0 0 0";
 		
 		add(L"f0", L"if(0-$4 ,0,if(25000-$4 ,$4 ,25000))");
 		add(L"f1", L"?f0 *2/1");
@@ -429,4 +515,63 @@ public:
 		handles.push_back(h);
 	}
 };
+class oox_shape_SwooshArrow : public oox_shape
+{
+public:
+	oox_shape_SwooshArrow()
+	{
+		odf_type_name	= L"ooxml-swooshArrow";
+
+		enhanced_path	= L"M 0 ?f30 Q ?f25 ?f23 ?f6 ?f8 L ?f11 0 ?f31 ?f20 ?f15 ?f16 ?f14 ?f13 Q ?f29 ?f27 0 ?f30 Z N";
+		text_areas		= L"0 0 ?f31 ?f30";
+		modifiers		= L"25000 25000";
+		view_box		= L"0 0 0 0";
+		
+		add(L"f0", L"if(1-$0 ,1,if(75000-$0 ,$0 ,75000))");
+		add(L"f1", L"min(logwidth,logheight)");
+		add(L"f2", L"70000*logwidth/?f1 ");
+		add(L"f3", L"if(0-$1 ,0,if(?f2 -$1 ,$1 ,?f2 ))");
+		add(L"f4", L"logheight*?f0 /100000");
+		add(L"f5", L"?f1 *?f3 /100000");
+		add(L"f6", L"logwidth+0-?f5 ");
+		add(L"f7", L"min(logwidth,logheight)/8");
+		add(L"f8", L"0+?f7 -0");
+		add(L"f9", L"5400000*1/14");
+		add(L"f10", L"?f7 *tan(pi*(?f9 )/10800000)");
+		add(L"f11", L"?f6 +0-?f10 ");
+		add(L"f12", L"?f4 *tan(pi*(?f9 )/10800000)");
+		add(L"f13", L"?f8 +?f4 -0");
+		add(L"f14", L"?f6 +?f12 -0");
+		add(L"f15", L"?f14 +?f10 -0");
+		add(L"f16", L"?f13 +?f7 -0");
+		add(L"f17", L"?f16 +0-0");
+		add(L"f18", L"?f17 *1/2");
+		add(L"f19", L"logheight*1/20");
+		add(L"f20", L"0+?f18 -?f19 ");
+		add(L"f21", L"logheight/6");
+		add(L"f22", L"?f21 *1/1");
+		add(L"f23", L"?f21 +?f22 -0");
+		add(L"f24", L"logwidth/6");
+		add(L"f25", L"?f24 ");
+		add(L"f26", L"?f21 *1/2");
+		add(L"f27", L"?f13 +?f26 -0");
+		add(L"f28", L"logwidth/4");
+		add(L"f29", L"?f28 ");
+		add(L"f30", L"logheight");
+		add(L"f31", L"logwidth");
+/////////////////////////////////////////////////////////
+		_handle h1, h2;
+
+		h1.position = L"?f54 ?f55";
+		h1.y_minimum = L"1";
+		h1.y_maximum = L"75000";
+		
+		handles.push_back(h1);
+
+ 		h2.position = L"?f60 ?f61";
+		h2.x_minimum = L"0";
+		h2.x_maximum = L"?f2";
+		handles.push_back(h2);
+	}
+};
 }

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeMaths.h

@@ -30,11 +30,11 @@
  *
  */
 #include "../oox_shape_defines.h"
-		//	shapetypeMathDivide,
-		//	shapetypeMathEqual,
-		//	shapetypeMathMinus,
-	//+	//	shapetypeMathMultiply,
-		//	shapetypeMathNotEqual,
+//	shapetypeMathDivide,
+//+	shapetypeMathEqual,
+//	shapetypeMathMinus,
+//+	shapetypeMathMultiply,
+//	shapetypeMathNotEqual,
 namespace cpdoccore 
 {
 class oox_shape_mathMultiply : public oox_shape
@@ -117,4 +117,47 @@ public:
 		handles.push_back(h);
 	}
 };
+class oox_shape_mathEqual : public oox_shape
+{
+public:
+	oox_shape_mathEqual()
+	{
+		odf_type_name	=L"ooxml-mathEqual";
+
+		enhanced_path	= L"M ?f13 ?f10 L ?f14 ?f10 ?f14 ?f8 ?f13 ?f8 Z M ?f13 ?f9 L ?f14 ?f9 ?f14 ?f11 ?f13 ?f11 Z N";
+		text_areas		= L"?f13 ?f10 ?f14 ?f11";
+		view_box		= L"0 0 0 0";
+		modifiers		= L"23520 11760";
+		
+		add(L"f0", L"if(0-$0 ,0,if(36745-$0 ,$0 ,36745))");
+		add(L"f1", L"?f0 *2/1");
+		add(L"f2", L"100000+0-2");
+		add(L"f3", L"if(0-$1 ,0,if(?f2 -$1 ,$1 ,?f2 ))");
+		add(L"f4", L"logheight*?f0 /100000");
+		add(L"f5", L"logheight*?f3 /200000");
+		add(L"f6", L"logwidth*73490/200000");
+		add(L"f7", L"logheight/2");
+		add(L"f8", L"?f7 +0-?f5 ");
+		add(L"f9", L"?f7 +?f5 -0");
+		add(L"f10", L"?f8 +0-?f4 ");
+		add(L"f11", L"?f9 +?f4 -0");
+		add(L"f12", L"logwidth/2");
+		add(L"f13", L"?f12 +0-?f6 ");
+		add(L"f14", L"?f12 +?f6 -0");
+		add(L"f15", L"(?f10 +?f8 )/2");
+		add(L"f16", L"(?f9 +?f11 )/2");
+		add(L"f17", L"logwidth");
+/////////////////////////////////////////////////////////
+		_handle h;
+		h.position = L"0 ?f10";
+		h.y_maximum= L"36745";
+		h.y_minimum= L"0";
+		handles.push_back(h);
+
+		h.position = L"?f17 ?f8";
+		h.y_maximum= L"?f2";
+		h.y_minimum= L"0";
+		handles.push_back(h);
+	}
+};
 }

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapePrimitives.h

@@ -30,8 +30,8 @@
  *
  */
 //	shapetypeArc,
-//	shapetypeChord,
-//	shapetypeCorner,
+//+	shapetypeChord,
+//+	shapetypeCorner,
 //	shapetypeCornerTabs,
 //	shapetypeDecagon,
 //	shapetypeDiagStripe,
@@ -49,6 +49,8 @@
 //	shapetypePlaqueTabs,
 //	shapetypeSquareTabs,
 //	shapetypeTeardrop,
+//+ shapetypeBlockArc
+//+ shapetypeDonut
 
 #include "../oox_shape_defines.h"
 
@@ -838,4 +840,267 @@ public:
 		handles.push_back(h);
 	}
 };
+class oox_shape_BlockArc : public oox_shape
+{
+public:
+	oox_shape_BlockArc()
+	{
+		odf_type_name	=L"ooxml-blockArc";
+
+		enhanced_path	= L"M ?f18 ?f20 G ?f7 ?f9 ?f76 ?f77 L ?f35 ?f36 G ?f25 ?f26 ?f78 ?f79 Z N";
+		text_areas		= L"f60 ?f68 ?f44 ?f52";
+		modifiers		= L"13500000 10800000 12740";
+		view_box		= L"0 0 0 0";
+		
+		add(L"f0", L"if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))");
+		add(L"f1", L"if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))");
+		add(L"f2", L"if(0-$2 ,0,if(50000-$2 ,$2 ,50000))");
+		add(L"f3", L"?f1 +0-?f0 ");
+		add(L"f4", L"?f3 +21600000-0");
+		add(L"f5", L"if(?f3 ,?f3 ,?f4 )");
+		add(L"f6", L"0+0-?f5 ");
+		add(L"f7", L"logwidth/2");
+		add(L"f8", L"?f7 *sin(pi*(?f0 )/10800000)");
+		add(L"f9", L"logheight/2");
+		add(L"f10", L"?f9 *cos(pi*(?f0 )/10800000)");
+		add(L"f11", L"?f7 *sin(pi*(?f1 )/10800000)");
+		add(L"f12", L"?f9 *cos(pi*(?f1 )/10800000)");
+		add(L"f13", L"?f7 *(cos(atan2(?f8 ,?f10 )))");
+		add(L"f14", L"?f9 *(sin(atan2(?f8 ,?f10 )))");
+		add(L"f15", L"?f7 *(cos(atan2(?f11 ,?f12 )))");
+		add(L"f16", L"?f9 *(sin(atan2(?f11 ,?f12 )))");
+		add(L"f17", L"logwidth/2");
+		add(L"f18", L"?f17 +?f13 -0");
+		add(L"f19", L"logheight/2");
+		add(L"f20", L"?f19 +?f14 -0");
+		add(L"f21", L"?f17 +?f15 -0");
+		add(L"f22", L"?f19 +?f16 -0");
+		add(L"f23", L"min(logwidth,logheight)");
+		add(L"f24", L"?f23 *?f2 /100000");
+		add(L"f25", L"?f7 +0-?f24 ");
+		add(L"f26", L"?f9 +0-?f24 ");
+		add(L"f27", L"?f25 *sin(pi*(?f1 )/10800000)");
+		add(L"f28", L"?f26 *cos(pi*(?f1 )/10800000)");
+		add(L"f29", L"?f25 *sin(pi*(?f0 )/10800000)");
+		add(L"f30", L"?f26 *cos(pi*(?f0 )/10800000)");
+		add(L"f31", L"?f25 *(cos(atan2(?f27 ,?f28 )))");
+		add(L"f32", L"?f26 *(sin(atan2(?f27 ,?f28 )))");
+		add(L"f33", L"?f25 *(cos(atan2(?f29 ,?f30 )))");
+		add(L"f34", L"?f26 *(sin(atan2(?f29 ,?f30 )))");
+		add(L"f35", L"?f17 +?f31 -0");
+		add(L"f36", L"?f19 +?f32 -0");
+		add(L"f37", L"?f17 +?f33 -0");
+		add(L"f38", L"?f19 +?f34 -0");
+		add(L"f39", L"21600000+0-?f0 ");
+		add(L"f40", L"?f5 +0-?f39 ");
+		add(L"f41", L"max(?f18 ,?f35 )");
+		add(L"f42", L"max(?f21 ,?f37 )");
+		add(L"f43", L"max(?f41 ,?f42 )");
+		add(L"f44", L"if(?f40 ,logwidth,?f43 )");
+		add(L"f45", L"5400000+0-?f0 ");
+		add(L"f46", L"27000000+0-?f0 ");
+		add(L"f47", L"if(?f45 ,?f45 ,?f46 )");
+		add(L"f48", L"?f5 +0-?f47 ");
+		add(L"f49", L"max(?f20 ,?f36 )");
+		add(L"f50", L"max(?f22 ,?f38 )");
+		add(L"f51", L"max(?f49 ,?f50 )");
+		add(L"f52", L"if(?f48 ,logheight,?f51 )");
+		add(L"f53", L"10800000+0-?f0 ");
+		add(L"f54", L"32400000+0-?f0 ");
+		add(L"f55", L"if(?f53 ,?f53 ,?f54 )");
+		add(L"f56", L"?f5 +0-?f55 ");
+		add(L"f57", L"min(?f18 ,?f35 )");
+		add(L"f58", L"min(?f21 ,?f37 )");
+		add(L"f59", L"min(?f57 ,?f58 )");
+		add(L"f60", L"if(?f56 ,0,?f59 )");
+		add(L"f61", L"16200000+0-?f0 ");
+		add(L"f62", L"37800000+0-?f0 ");
+		add(L"f63", L"if(?f61 ,?f61 ,?f62 )");
+		add(L"f64", L"?f5 +0-?f63 ");
+		add(L"f65", L"min(?f20 ,?f36 )");
+		add(L"f66", L"min(?f22 ,?f38 )");
+		add(L"f67", L"min(?f65 ,?f66 )");
+		add(L"f68", L"if(?f64 ,0,?f67 )");
+		add(L"f69", L"(?f18 +?f37 )/2");
+		add(L"f70", L"(?f20 +?f38 )/2");
+		add(L"f71", L"(?f21 +?f35 )/2");
+		add(L"f72", L"(?f22 +?f36 )/2");
+		add(L"f73", L"?f0 +0-5400000");
+		add(L"f74", L"?f1 +5400000-0");
+		add(L"f75", L"(?f73 +?f74 )/2");
+		add(L"f76", L"(?f0 )/60000.0");
+		add(L"f77", L"(?f5 )/60000.0");
+		add(L"f78", L"(?f1 )/60000.0");
+		add(L"f79", L"(?f6 )/60000.0");
+/////////////////////////////////////////////////////////
+		_handle h;
+
+		h.position = L"?f18 ?f20";
+		handles.push_back(h);
+
+		h.position = L"?f35 ?f36";
+		h.r_minimum = L"0";
+		h.r_maximum = L"50000";
+
+		handles.push_back(h);
+	}
+};
+class oox_shape_Corner : public oox_shape
+{
+public:
+	oox_shape_Corner()
+	{
+		odf_type_name	=L"ooxml-corner";
+
+		enhanced_path	= L"M 0 0 L ?f5 0 ?f5 ?f7 ?f13 ?f7 ?f13 ?f15 0 ?f15 Z N";
+		text_areas		= L"0 ?f11 ?f12 ?f15";
+		view_box		= L"0 0 0 0";
+		modifiers		= L"16120 16110";
+		
+		add(L"f0", L"min(logwidth,logheight)");
+		add(L"f1", L"100000*logheight/?f0 ");
+		add(L"f2", L"100000*logwidth/?f0 ");
+		add(L"f3", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
+		add(L"f4", L"if(0-$1 ,0,if(?f2 -$1 ,$1 ,?f2 ))");
+		add(L"f5", L"?f0 *?f4 /100000");
+		add(L"f6", L"?f0 *?f3 /100000");
+		add(L"f7", L"logheight+0-?f6 ");
+		add(L"f8", L"?f5 *1/2");
+		add(L"f9", L"(?f7 +logheight)/2");
+		add(L"f10", L"logwidth+0-logheight");
+		add(L"f11", L"if(?f10 ,?f7 ,0)");
+		add(L"f12", L"if(?f10 ,logwidth,?f5 )");
+		add(L"f13", L"logwidth");
+		add(L"f14", L"logwidth/2");
+		add(L"f15", L"logheight");
+		add(L"f16", L"logheight/2");
+/////////////////////////////////////////////////////////
+		_handle h1, h2;
+
+		h1.position = L"0 ?f7";
+		h1.y_minimum = L"0";
+		h1.y_maximum = L"?f1";
+		handles.push_back(h1);
+
+		h2.position = L"?f5 0";
+		h2.x_minimum = L"0";
+		h2.x_maximum = L"?f2";
+		handles.push_back(h2);
+	}
+};
+
+
+class oox_shape_Chord : public oox_shape
+{
+public:
+	oox_shape_Chord()
+	{
+		odf_type_name	=L"ooxml-chord";
+
+		enhanced_path	= L"M ?f16 ?f18 G ?f5 ?f7 ?f31 ?f32 Z N";
+		text_areas		= L"?f27 ?f29 ?f28 ?f30";
+		view_box		= L"0 0 0 0";
+		modifiers		= L"1168272 9631728";
+		
+		add(L"f0", L"if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))");
+		add(L"f1", L"if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))");
+		add(L"f2", L"?f1 +0-?f0 ");
+		add(L"f3", L"?f2 +21600000-0");
+		add(L"f4", L"if(?f2 ,?f2 ,?f3 )");
+		add(L"f5", L"logwidth/2");
+		add(L"f6", L"?f5 *sin(pi*(?f0 )/10800000)");
+		add(L"f7", L"logheight/2");
+		add(L"f8", L"?f7 *cos(pi*(?f0 )/10800000)");
+		add(L"f9", L"?f5 *(cos(atan2(?f6 ,?f8 )))");
+		add(L"f10", L"?f7 *(sin(atan2(?f6 ,?f8 )))");
+		add(L"f11", L"?f5 *sin(pi*(?f1 )/10800000)");
+		add(L"f12", L"?f7 *cos(pi*(?f1 )/10800000)");
+		add(L"f13", L"?f5 *(cos(atan2(?f11 ,?f12 )))");
+		add(L"f14", L"?f7 *(sin(atan2(?f11 ,?f12 )))");
+		add(L"f15", L"logwidth/2");
+		add(L"f16", L"?f15 +?f9 -0");
+		add(L"f17", L"logheight/2");
+		add(L"f18", L"?f17 +?f10 -0");
+		add(L"f19", L"?f15 +?f13 -0");
+		add(L"f20", L"?f17 +?f14 -0");
+		add(L"f21", L"(?f16 +?f19 )/2");
+		add(L"f22", L"(?f18 +?f20 )/2");
+		add(L"f23", L"?f4 *1/2");
+		add(L"f24", L"?f0 +?f23 -10800000");
+		add(L"f25", L"?f5 *cos(pi*(2700000)/10800000)");
+		add(L"f26", L"?f7 *sin(pi*(2700000)/10800000)");
+		add(L"f27", L"?f15 +0-?f25 ");
+		add(L"f28", L"?f15 +?f25 -0");
+		add(L"f29", L"?f17 +0-?f26 ");
+		add(L"f30", L"?f17 +?f26 -0");
+		add(L"f31", L"(?f0 )/60000.0");
+		add(L"f32", L"(?f4 )/60000.0");
+/////////////////////////////////////////////////////////
+		_handle h;
+
+		h.position = L"?f16 ?f18";
+		handles.push_back(h);
+		
+		h.position = L"?f19 ?f20";
+		handles.push_back(h);
+	}
+};
+
+
+class oox_shape_Donut : public oox_shape
+{
+public:
+	oox_shape_Donut()
+	{
+		odf_type_name	=L"ooxml-donut";
+
+		enhanced_path	= L"M 0 ?f12 G ?f3 ?f5 ?f17 ?f18 ?f3 ?f5 ?f19 ?f20 ?f3 ?f5 ?f21 ?f22 ?f3 ?f5 ?f23 ?f24 Z M ?f2 ?f12 G ?f4 ?f6 ?f25 ?f26 ?f4 ?f6 ?f27 ?f28 ?f4 ?f6 ?f29 ?f30 ?f4 ?f6 ?f31 ?f32 Z N";
+		text_areas		= L"?f10 ?f13 ?f11 ?f14";
+		view_box		= L"0 0 0 0";
+		modifiers		= L"20000";
+		
+		add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
+		add(L"f1", L"min(logwidth,logheight)");
+		add(L"f2", L"?f1 *?f0 /100000");
+		add(L"f3", L"logwidth/2");
+		add(L"f4", L"?f3 +0-?f2 ");
+		add(L"f5", L"logheight/2");
+		add(L"f6", L"?f5 +0-?f2 ");
+		add(L"f7", L"?f3 *cos(pi*(2700000)/10800000)");
+		add(L"f8", L"?f5 *sin(pi*(2700000)/10800000)");
+		add(L"f9", L"logwidth/2");
+		add(L"f10", L"?f9 +0-?f7 ");
+		add(L"f11", L"?f9 +?f7 -0");
+		add(L"f12", L"logheight/2");
+		add(L"f13", L"?f12 +0-?f8 ");
+		add(L"f14", L"?f12 +?f8 -0");
+		add(L"f15", L"logheight");
+		add(L"f16", L"logwidth");
+		add(L"f17", L"(10800000)/60000.0");
+		add(L"f18", L"(5400000)/60000.0");
+		add(L"f19", L"(16200000)/60000.0");
+		add(L"f20", L"(5400000)/60000.0");
+		add(L"f21", L"(0)/60000.0");
+		add(L"f22", L"(5400000)/60000.0");
+		add(L"f23", L"(5400000)/60000.0");
+		add(L"f24", L"(5400000)/60000.0");
+		add(L"f25", L"(10800000)/60000.0");
+		add(L"f26", L"(-5400000)/60000.0");
+		add(L"f27", L"(5400000)/60000.0");
+		add(L"f28", L"(-5400000)/60000.0");
+		add(L"f29", L"(0)/60000.0");
+		add(L"f30", L"(-5400000)/60000.0");
+		add(L"f31", L"(16200000)/60000.0");
+		add(L"f32", L"(-5400000)/60000.0");
+/////////////////////////////////////////////////////////
+		_handle h;
+
+		h.position = L"?f2 ?f12";
+		h.r_minimum = L"0";
+		h.r_maximum = L"50000";
+		handles.push_back(h);
+	}
+};
+
+
 }

ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeRibbons.h

@@ -29,4 +29,83 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-	//{	L""								,  7},			//	shapetypeLeftRightRibbon,
+//+	shapetypeLeftRightRibbon
+namespace cpdoccore 
+{
+class oox_shape_LeftRightRibbon : public oox_shape
+{
+public:
+	oox_shape_LeftRightRibbon()
+	{
+		odf_type_name	=L"ooxml-leftRightRibbon";
+
+		enhanced_path	= L"M 0 ?f16 L ?f9 0 ?f9 ?f14 ?f23 ?f14 G ?f4 ?f22 ?f30 ?f31 ?f4 ?f22 ?f32 ?f33 L ?f10 ?f21 ?f10 ?f19 ?f28 ?f17 ?f10 ?f29 ?f10 ?f15 ?f23 ?f15 G ?f4 ?f22 ?f34 ?f35 L ?f24 ?f20 ?f9 ?f20 ?f9 ?f18 Z S N M ?f25 ?f26 G ?f4 ?f22 ?f36 ?f37 ?f4 ?f22 ?f38 ?f39 L ?f25 ?f21 Z I S N M 0 ?f16 L ?f9 0 ?f9 ?f14 ?f23 ?f14 G ?f4 ?f22 ?f40 ?f41 ?f4 ?f22 ?f42 ?f43 L ?f10 ?f21 ?f10 ?f19 ?f28 ?f17 ?f10 ?f29 ?f10 ?f15 ?f23 ?f15 G ?f4 ?f22 ?f44 ?f45 L ?f24 ?f20 ?f9 ?f20 ?f9 ?f18 Z M ?f25 ?f26 L ?f25 ?f21 M ?f24 ?f27 L ?f24 ?f20 F N";
+		text_areas		= L"?f9 ?f14 ?f10 ?f15";
+		view_box		= L"0 0 0 0";
+		modifiers		= L"50000 50000 16667";
+		
+		add(L"f0", L"if(0-$2 ,0,if(33333-$2 ,$2 ,33333))");
+		add(L"f1", L"100000+0-?f0 ");
+		add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
+		add(L"f3", L"logwidth/2");
+		add(L"f4", L"logwidth/32");
+		add(L"f5", L"?f3 +0-?f4 ");
+		add(L"f6", L"min(logwidth,logheight)");
+		add(L"f7", L"100000*?f5 /?f6 ");
+		add(L"f8", L"if(0-$1 ,0,if(?f7 -$1 ,$1 ,?f7 ))");
+		add(L"f9", L"?f6 *?f8 /100000");
+		add(L"f10", L"logwidth+0-?f9 ");
+		add(L"f11", L"logheight*?f2 /200000");
+		add(L"f12", L"logheight*?f0 /-200000");
+		add(L"f13", L"logheight/2");
+		add(L"f14", L"?f13 +?f12 -?f11 ");
+		add(L"f15", L"?f13 +?f11 -?f12 ");
+		add(L"f16", L"?f14 +?f11 -0");
+		add(L"f17", L"logheight+0-?f16 ");
+		add(L"f18", L"?f16 *2/1");
+		add(L"f19", L"logheight+0-?f18 ");
+		add(L"f20", L"?f18 +0-?f14 ");
+		add(L"f21", L"logheight+0-?f20 ");
+		add(L"f22", L"?f0 *?f6 /400000");
+		add(L"f23", L"logwidth/2");
+		add(L"f24", L"?f23 +0-?f4 ");
+		add(L"f25", L"?f23 +?f4 -0");
+		add(L"f26", L"?f14 +?f22 -0");
+		add(L"f27", L"?f21 +0-?f22 ");
+		add(L"f28", L"logwidth");
+		add(L"f29", L"logheight");
+		add(L"f30", L"(16200000)/60000.0");
+		add(L"f31", L"(10800000)/60000.0");
+		add(L"f32", L"(16200000)/60000.0");
+		add(L"f33", L"(-10800000)/60000.0");
+		add(L"f34", L"(5400000)/60000.0");
+		add(L"f35", L"(5400000)/60000.0");
+		add(L"f36", L"(0)/60000.0");
+		add(L"f37", L"(5400000)/60000.0");
+		add(L"f38", L"(16200000)/60000.0");
+		add(L"f39", L"(-10800000)/60000.0");
+		add(L"f40", L"(16200000)/60000.0");
+		add(L"f41", L"(10800000)/60000.0");
+		add(L"f42", L"(16200000)/60000.0");
+		add(L"f43", L"(-10800000)/60000.0");
+		add(L"f44", L"(5400000)/60000.0");
+		add(L"f45", L"(5400000)/60000.0");
+/////////////////////////////////////////////////////////
+		_handle h1, h2, h3;
+		h1.position = L"??f10 ?f21";
+		h1.y_maximum= L"?f1";
+		h1.y_minimum= L"0";
+		handles.push_back(h1);
+
+		h2.position = L"?f9 0";
+		h2.x_maximum= L"?f7";
+		h2.x_minimum= L"0";
+		handles.push_back(h2);
+
+		h3.position = L"?f25 ?f21";
+		h3.y_maximum= L"33333";
+		h3.y_minimum= L"0";
+		handles.push_back(h3);
+	}
+};
+}

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -2014,7 +2014,7 @@ std::wstring odf_drawing_context::add_marker_style(int type)
 {
 	if (type == 2) return L"";
 
-	std::wstring str_types [] = {L"ArrowMarker", L"DiamondMarker", L"None", L"OvalMarker", L"StealthMarker", L"TriangleMarker"};
+	std::wstring str_types [] = {L"None", L"ArrowMarker", L"DiamondMarker", L"OvalMarker", L"StealthMarker", L"TriangleMarker"};
 
 	style * style_=NULL;
 	if (impl_->styles_context_->find_odf_style(str_types[type],style_family::Marker,style_)) return str_types[type];
@@ -2035,7 +2035,7 @@ std::wstring odf_drawing_context::add_marker_style(int type)
 
 	switch(type)
 	{
-	case 1:
+	case 2:
 		marker->svg_d_ = L"M0 564l564 567 567-567-567-564z";
 		marker->svg_viewBox_ = L"0 0 1131 1131";
 		break;
@@ -2051,7 +2051,7 @@ std::wstring odf_drawing_context::add_marker_style(int type)
 		marker->svg_d_ = L"M1321 3493h-1321l702-3493z";
 		marker->svg_viewBox_ = L"0 0 1321 3493";
 		break;
-	case 0:
+	case 1:
 	default:
 		marker->svg_d_ =L"M0 2108v17 17l12 42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12 34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z";
 		marker->svg_viewBox_ = L"0 0 1122 2243";
@@ -3037,8 +3037,8 @@ void odf_drawing_context::start_bitmap_style()
 
 	odf_writer::office_element_ptr fill_image_element;
 
-	odf_writer::create_element(L"draw",L"fill-image", fill_image_element, impl_->odf_context_);
-	impl_->styles_context_->add_style(fill_image_element,false,true, style_family::FillImage);
+	odf_writer::create_element(L"draw", L"fill-image", fill_image_element, impl_->odf_context_);
+	impl_->styles_context_->add_style(fill_image_element, false, true, style_family::FillImage);
 
 	draw_fill_image * fill_image = dynamic_cast<draw_fill_image *>(fill_image_element.get());
 	if (!fill_image) return;

ASCOfficeOdfFileW/source/OdfFormat/oox_shape_defines.cpp

@@ -60,6 +60,7 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	switch (ooxPrstGeomType)
 	{
 	case SimpleTypes::shapetypeMathMultiply:		return boost::make_shared<oox_shape_mathMultiply>();
+	case SimpleTypes::shapetypeMathEqual:			return boost::make_shared<oox_shape_mathEqual>();
 	case SimpleTypes::shapetypeSun:					return boost::make_shared<oox_shape_sun>();
 	case SimpleTypes::shapetypeRound1Rect:			return boost::make_shared<oox_shape_round1Rect>();
 	case SimpleTypes::shapetypeRound2DiagRect:		return boost::make_shared<oox_shape_round2DiagRect>();
@@ -81,12 +82,17 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
 	case SimpleTypes::shapetypeCurvedLeftArrow:		return boost::make_shared<oox_shape_curvedLeftArrow>();
 	case SimpleTypes::shapetypeCurvedDownArrow:		return boost::make_shared<oox_shape_curvedDownArrow>();
 	case SimpleTypes::shapetypeLeftCircularArrow:	return boost::make_shared<oox_shape_LeftCircularArrow>();
+	case SimpleTypes::shapetypeSwooshArrow:			return boost::make_shared<oox_shape_SwooshArrow>();
+	case SimpleTypes::shapetypeBlockArc:			return boost::make_shared<oox_shape_BlockArc>();
+	case SimpleTypes::shapetypeCorner:				return boost::make_shared<oox_shape_Corner>();
+	case SimpleTypes::shapetypeChord:				return boost::make_shared<oox_shape_Chord>();
 
 	case SimpleTypes::shapetypePlaque:				return boost::make_shared<oox_shape_Plaque>();
 	case SimpleTypes::shapetypeDoubleWave:			return boost::make_shared<oox_shape_DoubleWave>();
 	case SimpleTypes::shapetypePieWedge:			return boost::make_shared<oox_shape_PieWedge>();
 	case SimpleTypes::shapetypePie:					return boost::make_shared<oox_shape_Pie>();
-		
+	case SimpleTypes::shapetypeDonut:				return boost::make_shared<oox_shape_Donut>();	
+	case SimpleTypes::shapetypeLeftRightRibbon:		return boost::make_shared<oox_shape_LeftRightRibbon>();	
 		
 
 	//case (2001 + SimpleTypes::textshapetypeTextArchDown): 

ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.cpp

@@ -126,12 +126,12 @@ void style_background_image::serialize(std::wostream & strm)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			CP_XML_ATTR_OPT(L"style:repeat", style_repeat_);
-			CP_XML_ATTR_OPT(L"style:position", style_position_);
-			CP_XML_ATTR_OPT(L"filter:name", filter_name_);
-			CP_XML_ATTR_OPT(L"draw:opacity", draw_opacity_);
+			CP_XML_ATTR_OPT(L"style:repeat",	style_repeat_);
+			CP_XML_ATTR_OPT(L"style:position",	style_position_);
+			CP_XML_ATTR_OPT(L"filter:name",		filter_name_);
+			CP_XML_ATTR_OPT(L"draw:opacity",	draw_opacity_);
 
-			if (common_xlink_attlist_)	common_xlink_attlist_->serialize(CP_GET_XML_NODE());
+			if (xlink_attlist_)	xlink_attlist_->serialize(CP_GET_XML_NODE());
 			if (office_binary_data_)	office_binary_data_->serialize(CP_XML_STREAM());
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.h

@@ -169,13 +169,14 @@ public:
 
 	virtual void serialize(std::wostream & strm);
     
-    _CP_OPT(odf_types::style_repeat) style_repeat_;
-    _CP_OPT(odf_types::style_position) style_position_;
-    _CP_OPT(std::wstring) filter_name_;
-    _CP_OPT(odf_types::percent) draw_opacity_;
+    _CP_OPT(odf_types::style_repeat)		style_repeat_;
+    _CP_OPT(odf_types::style_position)		style_position_;
+    _CP_OPT(std::wstring)					filter_name_;
+    _CP_OPT(odf_types::percent)				draw_opacity_;
 
-    _CP_OPT(odf_types::common_xlink_attlist) common_xlink_attlist_;
-    office_element_ptr office_binary_data_;
+    _CP_OPT(odf_types::common_xlink_attlist) xlink_attlist_;
+    
+	office_element_ptr office_binary_data_;
 
 };
 

ASCOfficeOdfFileW/source/OdfFormat/styles.cpp

@@ -1164,13 +1164,13 @@ void style_page_layout::serialize(std::wostream & strm)
 //////////////////////////////////////////////////////////////////////////////////////////////////
 void style_footnote_sep_attlist::serialize(CP_ATTR_NODE)
 {
-    CP_XML_ATTR_OPT(L"style:width", style_width_);
-    CP_XML_ATTR_OPT(L"style:rel-width", style_rel_width_);
-    CP_XML_ATTR_OPT(L"style:color", style_color_);
-    CP_XML_ATTR_OPT(L"style:line-style", style_line_style_);
-    CP_XML_ATTR_OPT(L"style:type", style_adjustment_); // default Left
-    CP_XML_ATTR_OPT(L"style:distance-before-sep", style_distance_before_sep_);
-    CP_XML_ATTR_OPT(L"style:distance-after-sep", style_distance_after_sep_);
+    CP_XML_ATTR_OPT(L"style:width",			style_width_);
+    CP_XML_ATTR_OPT(L"style:rel-width",		style_rel_width_);
+    CP_XML_ATTR_OPT(L"style:color",			style_color_);
+    CP_XML_ATTR_OPT(L"style:line-style",	style_line_style_);
+    CP_XML_ATTR_OPT(L"style:type",					style_adjustment_);		// default Left
+    CP_XML_ATTR_OPT(L"style:distance-before-sep",	style_distance_before_sep_);
+    CP_XML_ATTR_OPT(L"style:distance-after-sep",	style_distance_after_sep_);
 }
 
 const wchar_t * style_footnote_sep::ns = L"style";

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -1011,7 +1011,7 @@ void OoxConverter::convert(PPTX::Logic::Ln *oox_line_prop, DWORD ARGB, PPTX::Log
 	{
 		if (oox_line_prop->headEnd->len.IsInit() || oox_line_prop->headEnd->type.IsInit() || oox_line_prop->headEnd->w.IsInit())
 		{
-			int type = 0, w = 1, len = 1;//medium arrow
+			int type = 1, w = 1, len = 1;//medium arrow
 			if (oox_line_prop->headEnd->len.IsInit())	len		= oox_line_prop->headEnd->len->GetBYTECode();
 			if (oox_line_prop->headEnd->type.IsInit())	type	= oox_line_prop->headEnd->type->GetBYTECode();
 			if (oox_line_prop->headEnd->w.IsInit())		w		= oox_line_prop->headEnd->w->GetBYTECode();
@@ -1023,11 +1023,11 @@ void OoxConverter::convert(PPTX::Logic::Ln *oox_line_prop, DWORD ARGB, PPTX::Log
 	{
 		if (oox_line_prop->tailEnd->len.IsInit() || oox_line_prop->tailEnd->type.IsInit() || oox_line_prop->tailEnd->w.IsInit())
 		{
-			int type = 0, w = 1, len = 1;//medium arrow
+			int type = 1, w = 1, len = 1;//medium arrow
 			if (oox_line_prop->tailEnd->len.IsInit())	len		= oox_line_prop->tailEnd->len->GetBYTECode();
 			if (oox_line_prop->tailEnd->type.IsInit())	type	= oox_line_prop->tailEnd->type->GetBYTECode();
 			if (oox_line_prop->tailEnd->w.IsInit())		w		= oox_line_prop->tailEnd->w->GetBYTECode();
-			
+
 			odf_context()->drawing_context()->set_line_tail(type, len, w);
 		}
 	}
@@ -1883,8 +1883,11 @@ void OoxConverter::convert(PPTX::Logic::TxBody *oox_txBody, PPTX::Logic::ShapeSt
 void OoxConverter::convert(PPTX::Logic::ArcTo *oox_geom_path)
 {
 	if (!oox_geom_path) return;
+
+	int stAng = XmlUtils::GetInteger(oox_geom_path->stAng);
+	int swAng = XmlUtils::GetInteger(oox_geom_path->swAng);
 	
-	std::wstring path_elm = oox_geom_path->hR + L" " + oox_geom_path->wR + L" " + oox_geom_path->swAng + L" " + oox_geom_path->stAng;
+	std::wstring path_elm = oox_geom_path->wR + L" " + oox_geom_path->hR + L" " + std::to_wstring(stAng/60000) + L" " + std::to_wstring(swAng /60000);
 	
 	odf_context()->drawing_context()->add_path_element(std::wstring(L"G"), path_elm);
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp

@@ -651,15 +651,15 @@ void OoxConverter::convert(OOX::Vml::CStroke *vml_stroke)
 	switch(vml_stroke->m_oStartArrow.GetValue())
 	{
 		case SimpleTypes::strokearrowtypeBlock:
-			odf_context()->drawing_context()->set_line_head(SimpleTypes::lineendtypeStealth,vml_stroke->m_oStartArrowLength.GetValue(),vml_stroke->m_oStartArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_head(4, vml_stroke->m_oStartArrowLength.GetValue(), vml_stroke->m_oStartArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeClassic:
-			odf_context()->drawing_context()->set_line_head(SimpleTypes::lineendtypeArrow,vml_stroke->m_oStartArrowLength.GetValue(),vml_stroke->m_oStartArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_head(1, vml_stroke->m_oStartArrowLength.GetValue(), vml_stroke->m_oStartArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeDiamond:
-			odf_context()->drawing_context()->set_line_head(SimpleTypes::lineendtypeDiamond,vml_stroke->m_oStartArrowLength.GetValue(),vml_stroke->m_oStartArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_head(2, vml_stroke->m_oStartArrowLength.GetValue(), vml_stroke->m_oStartArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeOpen:
-			odf_context()->drawing_context()->set_line_head(SimpleTypes::lineendtypeTriangle,vml_stroke->m_oStartArrowLength.GetValue(),vml_stroke->m_oStartArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_head(5, vml_stroke->m_oStartArrowLength.GetValue(), vml_stroke->m_oStartArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeOval:
-			odf_context()->drawing_context()->set_line_head(SimpleTypes::lineendtypeOval,vml_stroke->m_oStartArrowLength.GetValue(),vml_stroke->m_oStartArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_head(3, vml_stroke->m_oStartArrowLength.GetValue(), vml_stroke->m_oStartArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeNone:
 		default:
 				break;
@@ -667,15 +667,15 @@ void OoxConverter::convert(OOX::Vml::CStroke *vml_stroke)
 	switch(vml_stroke->m_oEndArrow.GetValue())
 	{
 		case SimpleTypes::strokearrowtypeBlock:
-			odf_context()->drawing_context()->set_line_tail(SimpleTypes::lineendtypeStealth,vml_stroke->m_oEndArrowLength.GetValue(),vml_stroke->m_oEndArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_tail(4, vml_stroke->m_oEndArrowLength.GetValue(), vml_stroke->m_oEndArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeClassic:
-			odf_context()->drawing_context()->set_line_tail(SimpleTypes::lineendtypeArrow,vml_stroke->m_oEndArrowLength.GetValue(),vml_stroke->m_oEndArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_tail(1, vml_stroke->m_oEndArrowLength.GetValue(), vml_stroke->m_oEndArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeDiamond:
-			odf_context()->drawing_context()->set_line_tail(SimpleTypes::lineendtypeDiamond,vml_stroke->m_oEndArrowLength.GetValue(),vml_stroke->m_oEndArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_tail(2, vml_stroke->m_oEndArrowLength.GetValue(), vml_stroke->m_oEndArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeOpen:
-			odf_context()->drawing_context()->set_line_tail(SimpleTypes::lineendtypeTriangle,vml_stroke->m_oEndArrowLength.GetValue(),vml_stroke->m_oEndArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_tail(5, vml_stroke->m_oEndArrowLength.GetValue(), vml_stroke->m_oEndArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeOval:
-			odf_context()->drawing_context()->set_line_tail(SimpleTypes::lineendtypeOval,vml_stroke->m_oEndArrowLength.GetValue(),vml_stroke->m_oEndArrowWidth.GetValue()); break;
+			odf_context()->drawing_context()->set_line_tail(3, vml_stroke->m_oEndArrowLength.GetValue(), vml_stroke->m_oEndArrowWidth.GetValue()); break;
 		case SimpleTypes::strokearrowtypeNone:
 		default:
 				break;

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -30,9 +30,7 @@
  *
  */
 #include "XlsxConverter.h"
-#include "../utils.h"
-
-#include <boost/foreach.hpp>
+#include "../../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
 
 #include "../OdfFormat/ods_conversion_context.h"
 
@@ -45,8 +43,9 @@
 #include "../OdfFormat/style_text_properties.h"
 #include "../OdfFormat/style_paragraph_properties.h"
 #include "../OdfFormat/style_graphic_properties.h"
+#include "../OdfFormat/style_page_layout_properties.h"
 
-#include "../../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
+#include "../utils.h"
 
 using namespace cpdoccore;
 
@@ -241,10 +240,14 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 {
 	if (!oox_sheet) return;
 
+	OOX::IFileContainer* old_container = xlsx_current_container;
+	xlsx_current_container = dynamic_cast<OOX::IFileContainer*>(oox_sheet);
+	
 	if (oox_sheet->m_oDimension.IsInit())
 	{
 		ods_context->set_sheet_dimension(oox_sheet->m_oDimension->m_oRef.get());
 	}
+
 	convert(oox_sheet->m_oSheetFormatPr.GetPointer());
 	convert(oox_sheet->m_oSheetPr.GetPointer());
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -346,8 +349,37 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 	convert(oox_sheet->m_oSheetViews.GetPointer());
 	convert(oox_sheet->m_oPageSetup.GetPointer());
 	convert(oox_sheet->m_oPageMargins.GetPointer());
-}
+	convert(oox_sheet->m_oPicture.GetPointer());
 
+	xlsx_current_container = old_container;
+}
+void XlsxConverter::convert(OOX::Spreadsheet::CPictureWorksheet *oox_background)
+{
+	if (!oox_background) return;
+	if (!oox_background->m_oId.IsInit())return;
+
+	std::wstring sID, pathImage, href;
+	sID         = oox_background->m_oId->GetValue();
+	pathImage   = find_link_by_id(sID, 1);
+	href		= ods_context->add_image(pathImage);
+
+	if (href.empty()) return;
+
+	odf_writer::office_element_ptr fill_image_element;
+
+	odf_writer::create_element(L"style", L"background-image", fill_image_element, ods_context);
+
+	odf_writer::style_background_image * fill_image = dynamic_cast<odf_writer::style_background_image*>(fill_image_element.get());
+	if (!fill_image) return;
+
+	fill_image->xlink_attlist_				= odf_types::common_xlink_attlist();
+	fill_image->xlink_attlist_->type_		= odf_types::xlink_type::Simple;
+	fill_image->xlink_attlist_->actuate_	= odf_types::xlink_actuate::OnLoad;	
+	fill_image->xlink_attlist_->href_		= href;
+
+	odf_writer::style_page_layout_properties* page_props = ods_context->page_layout_context()->last_layout()->get_properties();
+	page_props->add_child_element(fill_image_element);
+}
 void XlsxConverter::convert(OOX::Spreadsheet::CTable *oox_table_part)
 {
 	if (!oox_table_part) return;
@@ -1012,7 +1044,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
 		//nullable<SimpleTypes::COnOff<>>						m_oDefaultGridColor;
 		//nullable<SimpleTypes::COnOff<>>						m_oShowRuler;
 		//nullable<SimpleTypes::COnOff<>>						m_oShowWhiteSpace;
-        //nullable<std::wstring>										m_oTopLeftCell;
+        //nullable<std::wstring>								m_oTopLeftCell;
 		//nullable<SimpleTypes::Spreadsheet::CSheetViewType<>>	m_oView;
 		//nullable<SimpleTypes::COnOff<>>						m_oWindowProtection;
 		//nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oZoomScaleNormal;
@@ -1026,15 +1058,67 @@ void XlsxConverter::convert(OOX::Spreadsheet::CPageSetup *oox_page)
 	if (!oox_page) return;
 
 	int type = 1;	
+	if (oox_page->m_oOrientation.IsInit())
+	{
+		type = (int)oox_page->m_oOrientation->GetValue();
+	}
 	ods_context->page_layout_context()->set_page_orientation(type);
+
+	_CP_OPT(odf_types::length) width, height;
+	if (oox_page->m_oPaperWidth.IsInit() && oox_page->m_oPaperHeight.IsInit())
+	{
+		double w	= oox_page->m_oPaperWidth->GetValue();
+		double h	= oox_page->m_oPaperHeight->GetValue();
+		int unit = oox_page->m_oPaperUnits.IsInit() ? oox_page->m_oPaperUnits->GetValue() : 0;
+
+		switch(unit)
+		{
+		case 1:
+			width	= odf_types::length(w, odf_types::length::cm);
+			height	= odf_types::length(h, odf_types::length::cm);
+		case 2:
+			width	= odf_types::length(w, odf_types::length::inch);
+			height	= odf_types::length(h, odf_types::length::inch);
+		case 3:
+			width	= odf_types::length(w, odf_types::length::pt);
+			height	= odf_types::length(h, odf_types::length::pt);
+		case 4:
+			width	= odf_types::length(w, odf_types::length::px);
+			height	= odf_types::length(h, odf_types::length::px);
+		case 0:
+		default:
+			width	= odf_types::length(w, odf_types::length::mm);
+			height	= odf_types::length(h, odf_types::length::mm);
+		}
+	}
+	else if (oox_page->m_oPaperSize.IsInit())
+	{
+		switch(oox_page->m_oPaperSize->GetValue())
+		{
+		case SimpleTypes::Spreadsheet::pagesizeLetterPaper:
+			width	= odf_types::length(8.5, odf_types::length::inch);
+			height	= odf_types::length(11, odf_types::length::inch);
+			break;
+		case SimpleTypes::Spreadsheet::pagesizeA3Paper:
+			width	= odf_types::length(210, odf_types::length::mm);
+			height	= odf_types::length(297, odf_types::length::mm);
+			break;
+		case SimpleTypes::Spreadsheet::pagesizeA4Paper:
+			width	= odf_types::length(297, odf_types::length::mm);
+			height	= odf_types::length(420, odf_types::length::mm);
+			break;
+			//todooo
+		}
+	}
+	ods_context->page_layout_context()->set_page_size(width, height);
 }
 
-void XlsxConverter::convert(OOX::Spreadsheet::CPageMargins			*oox_page)
+void XlsxConverter::convert(OOX::Spreadsheet::CPageMargins *oox_page)
 {
 	if (!oox_page) return;
 	_CP_OPT(double) top, left,right,header,footer,bottom;
 
-	ods_context->page_layout_context()->set_page_margin(top,left,bottom, right,header,footer);
+	ods_context->page_layout_context()->set_page_margin(top, left, bottom, right, header, footer);
 
 }
 void XlsxConverter::convert(OOX::Spreadsheet::CSheetFormatPr *oox_sheet_format_pr)
@@ -1736,6 +1820,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing)
 {
 	if (!oox_drawing)return;
 	
+	OOX::IFileContainer* old_container = xlsx_current_container;
 	xlsx_current_container = dynamic_cast<OOX::IFileContainer*>(oox_drawing);
 
 	for (unsigned int dr = 0 ; dr < oox_drawing->m_arrItems.size(); dr++)
@@ -1745,7 +1830,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing)
 		ods_context->end_drawings();
 	}
 
-	xlsx_current_container = NULL;
+	xlsx_current_container = old_container;
 }
 
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h

@@ -88,6 +88,7 @@ namespace OOX
 		class CPageMargins;
 		class CSi;
 		class CWorkbookView;
+		class CPictureWorksheet;
 	}
 }
 
@@ -151,6 +152,7 @@ namespace Oox2Odf
 		void convert(OOX::Spreadsheet::CWorksheet			*oox_sheet);
 		void convert(OOX::Spreadsheet::CDefinedName			*oox_defined);
 		void convert(OOX::Spreadsheet::CTable				*oox_table_part);
+		void convert(OOX::Spreadsheet::CPictureWorksheet	*oox_background);
 
 		void convert(OOX::Spreadsheet::CCol					*oox_column);
 		void convert(OOX::Spreadsheet::CRow					*oox_row);

Common/DocxFormat/Source/XlsxFormat/SimpleTypes_Spreadsheet.h

@@ -1681,27 +1681,73 @@ namespace SimpleTypes
                 return this->m_eValue;
 			}
 
-			virtual std::wstring     ToString  () const 
+			virtual std::wstring ToString  () const 
 			{
                 return std::to_wstring(this->m_eValue );
 			}
 
 			SimpleType_FromString     (EPageSize)
-				SimpleType_Operator_Equal (CPageSize)
+			SimpleType_Operator_Equal (CPageSize)
+		};
+		
+		enum EPageUnits
+		{
+			mm		= 0,
+			cm		= 1,
+			inch	= 2,
+			pt		= 3,
+			px		= 4,
+			emu		= 5
+
+		};
+		template<EPageUnits eDefValue = mm>
+		class CPageUnits : public CSimpleType<EPageUnits, eDefValue>
+		{
+		public:
+			CPageUnits() {}
+
+            virtual EPageUnits FromString(std::wstring &sValue)
+			{
+					 if	(sValue == L"in")	this->m_eValue = inch;
+				else if (sValue == L"mm")	this->m_eValue = mm;
+				else if (sValue == L"cm")	this->m_eValue = cm;
+				else if (sValue == L"pt")	this->m_eValue = pt;
+				else if (sValue == L"px")	this->m_eValue = px;
+
+                return this->m_eValue;
+			}
+
+			virtual std::wstring ToString  () const 
+			{
+                std::wstring sResult;
+                switch(this->m_eValue)
+				{
+                case mm:	sResult = L"mm";break;
+                case cm:	sResult = L"cm";break;
+                case pt:	sResult = L"pt";break;
+                case px:	sResult = L"px";break;
+                case inch:	sResult = L"in";break;
+				}
+				return sResult;
+			}
+
+			SimpleType_FromString     (EPageUnits)
+			SimpleType_Operator_Equal (CPageUnits)
 		};
 		enum ETotalsRowFunction
 		{
-			totalrowfunctionAverage	=  1,
-			totalrowfunctionCount =  2,
-			totalrowfunctionCountNums =  3,
-			totalrowfunctionCustom =  4,
-			totalrowfunctionMax =  5,
-			totalrowfunctionMin =  6,
-			totalrowfunctionNone =  7,
-			totalrowfunctionStdDev =  8,
-			totalrowfunctionSum =  9,
-			totalrowfunctionVar =  10
+			totalrowfunctionAverage		=  1,
+			totalrowfunctionCount		=  2,
+			totalrowfunctionCountNums	=  3,
+			totalrowfunctionCustom		=  4,
+			totalrowfunctionMax			=  5,
+			totalrowfunctionMin			=  6,
+			totalrowfunctionNone		=  7,
+			totalrowfunctionStdDev		=  8,
+			totalrowfunctionSum			=  9,
+			totalrowfunctionVar			=  10
 		};
+
 		template<ETotalsRowFunction eDefValue = totalrowfunctionNone>
 		class CTotalsRowFunction : public CSimpleType<ETotalsRowFunction, eDefValue>
 		{

Common/DocxFormat/Source/XlsxFormat/Worksheets/WorksheetChildOther.h

@@ -87,17 +87,14 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("left"),      m_oLeft)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("top"),      m_oTop)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("right"),      m_oRight)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("bottom"),      m_oBottom)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("header"),      m_oHeader)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("footer"),      m_oFooter)
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("left"),	m_oLeft)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("top"),		m_oTop)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("right"),	m_oRight)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("bottom"),	m_oBottom)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("header"),	m_oHeader)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("footer"),	m_oFooter)
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
@@ -121,7 +118,7 @@ namespace OOX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 			}
-            virtual std::wstring      toXML() const
+            virtual std::wstring toXML() const
 			{
 				return _T("");
 			}
@@ -138,10 +135,14 @@ namespace OOX
                         writer.WriteString(sOrientation.c_str());
 						writer.WriteString(L"\"");
 					}
+					if (m_oRId.IsInit())
+					{
+						WritingStringAttrString(L"r:id", m_oRId->ToString());
+					}
 					writer.WriteString(L"/>");
 				}
 			}
-			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
+			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
 				ReadAttributes( oReader );
 
@@ -153,23 +154,23 @@ namespace OOX
 			{
 				return et_x_PageSetup;
 			}
-
-		private:
-
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("orientation"),      m_oOrientation)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("paperSize"),      m_oPaperSize)
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("orientation"),	m_oOrientation)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("paperSize"),	m_oPaperSize)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("paperUnits"),	m_oPaperUnits)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("paperWidth"),	m_oPaperWidth)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("paperHeight"),	m_oPaperHeight)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("r:id"),		m_oRId)
+				WritingElement_ReadAttributes_End( oReader )
 			}
-
-		public:
-			nullable<SimpleTypes::CPageOrientation<>>	m_oOrientation;
-			nullable<SimpleTypes::Spreadsheet::CPageSize<>>	m_oPaperSize;
+			nullable<SimpleTypes::CRelationshipId>				m_oRId;
+			nullable<SimpleTypes::CPageOrientation<>>			m_oOrientation;
+			nullable<SimpleTypes::Spreadsheet::CPageSize<>>		m_oPaperSize;
+			nullable<SimpleTypes::Spreadsheet::CPageUnits<>>	m_oPaperUnits;
+			nullable<SimpleTypes::CDouble>						m_oPaperWidth;
+			nullable<SimpleTypes::CDouble>						m_oPaperHeight;
 		};
 		class CPrintOptions : public WritingElement
 		{
@@ -193,8 +194,8 @@ namespace OOX
 				if(m_oGridLines.IsInit() || m_oGridLinesSet.IsInit() || m_oHeadings.IsInit())
 				{
 					writer.WriteString(L"<printOptions");
-					WritingStringNullableAttrBool(L"headings", m_oHeadings);
-					WritingStringNullableAttrBool(L"gridLines", m_oGridLines);
+					WritingStringNullableAttrBool(L"headings",	m_oHeadings);
+					WritingStringNullableAttrBool(L"gridLines",	m_oGridLines);
 					WritingStringNullableAttrBool(L"gridLinesSet", m_oGridLinesSet);
 					writer.WriteString(L"/>");
 				}
@@ -216,16 +217,13 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("gridLines"),      m_oGridLines)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("gridLinesSet"),      m_oGridLinesSet)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("headings"),      m_oHeadings)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("horizontalCentered"),      m_oHorizontalCentered)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("verticalCentered"),      m_oVerticalCentered)
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("gridLines"),			m_oGridLines)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("gridLinesSet"),		m_oGridLinesSet)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("headings"),			m_oHeadings)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("horizontalCentered"),	m_oHorizontalCentered)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("verticalCentered"),	m_oVerticalCentered)
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
@@ -272,12 +270,9 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
 					WritingElement_ReadAttributes_Read_if     ( oReader, _T("ref"),      m_oRef)
-
-					WritingElement_ReadAttributes_End( oReader )
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
@@ -315,7 +310,7 @@ namespace OOX
 				WritingStringNullableAttrBool(L"zeroHeight", m_oZeroHeight);
 				writer.WriteString(_T("/>"));
 			}
-			virtual void         fromXML(XmlUtils::CXmlLiteReader& oReader)
+			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
 				ReadAttributes( oReader );
 
@@ -332,20 +327,17 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("baseColWidth"),      m_oBaseColWidth)	// ToDo Excel не воспринимает значения не uint (мы приводим к uint)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("customHeight"),      m_oCustomHeight )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultColWidth"),      m_oDefaultColWidth )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultRowHeight"),      m_oDefaultRowHeight )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("outlineLevelCol"),      m_oOutlineLevelCol )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("outlineLevelRow"),      m_oOutlineLevelRow )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("thickBottom"),      m_oThickBottom )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("thickTop"),      m_oThickTop )
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zeroHeight"),      m_oZeroHeight )
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("baseColWidth"),		m_oBaseColWidth)	// ToDo Excel не воспринимает значения не uint (мы приводим к uint)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("customHeight"),		m_oCustomHeight )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultColWidth"),		m_oDefaultColWidth )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultRowHeight"),	m_oDefaultRowHeight )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("outlineLevelCol"),		m_oOutlineLevelCol )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("outlineLevelRow"),		m_oOutlineLevelRow )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("thickBottom"),			m_oThickBottom )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("thickTop"),			m_oThickTop )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zeroHeight"),			m_oZeroHeight )
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
@@ -402,22 +394,19 @@ namespace OOX
 		private:
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("activePane")	, m_oActivePane)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("state")		, m_oState)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("topLeftCell")	, m_oTopLeftCell)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("xSplit")		, m_oXSplit)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("ySplit")		, m_oYSplit)	
-
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("activePane")	, m_oActivePane)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("state")		, m_oState)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("topLeftCell")	, m_oTopLeftCell)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("xSplit")		, m_oXSplit)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("ySplit")		, m_oYSplit)	
 				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
             nullable<SimpleTypes::Spreadsheet::CActivePane<>>   m_oActivePane;
             nullable<SimpleTypes::Spreadsheet::CPaneState<>>    m_oState;
-            nullable<std::wstring>                                   m_oTopLeftCell;
+            nullable<std::wstring>								m_oTopLeftCell;
             nullable<SimpleTypes::CDouble>                      m_oXSplit;
             nullable<SimpleTypes::CDouble>                      m_oYSplit;
 		};
@@ -464,21 +453,18 @@ namespace OOX
 		private:
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("activeCell")	, m_oActiveCell)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("activeCellId")	, m_oActiveCellId)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("sqref")		, m_oSqref)
-				WritingElement_ReadAttributes_Read_if     ( oReader, _T("pane")			, m_oPane)
-
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("activeCell")	, m_oActiveCell)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("activeCellId")	, m_oActiveCellId)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("sqref")		, m_oSqref)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("pane")			, m_oPane)
 				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
-			nullable<std::wstring>									m_oActiveCell;
+			nullable<std::wstring>								m_oActiveCell;
 			nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oActiveCellId;
-			nullable<std::wstring>									m_oSqref;
+			nullable<std::wstring>								m_oSqref;
 			nullable<SimpleTypes::Spreadsheet::CActivePane<>>	m_oPane;
 		};
 
@@ -566,30 +552,27 @@ namespace OOX
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
-				// Читаем атрибуты
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("colorId"),      m_oColorId)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultGridColor"),      m_oDefaultGridColor)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("rightToLeft"),      m_oRightToLeft)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showFormulas"),      m_oShowFormulas)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showGridLines"),      m_oShowGridLines)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showOutlineSymbols"),      m_oShowOutlineSymbols)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showRowColHeaders"),      m_oShowRowColHeaders)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showRuler"),      m_oShowRuler)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showWhiteSpace"),      m_oShowWhiteSpace)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showZeros"),      m_oShowZeros)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("tabSelected"),      m_oTabSelected)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("topLeftCell"),      m_oTopLeftCell)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("view"),      m_oView)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("windowProtection"),      m_oWindowProtection)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("workbookViewId"),      m_oWorkbookViewId)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScale"),      m_oZoomScale)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScaleNormal"),      m_oZoomScaleNormal)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScalePageLayoutView"),      m_oZoomScalePageLayoutView)
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScaleSheetLayoutView"),      m_oZoomScaleSheetLayoutView)		
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("colorId"),				m_oColorId)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("defaultGridColor"),	m_oDefaultGridColor)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("rightToLeft"),			m_oRightToLeft)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showFormulas"),		m_oShowFormulas)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showGridLines"),		m_oShowGridLines)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showOutlineSymbols"),	m_oShowOutlineSymbols)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showRowColHeaders"),	m_oShowRowColHeaders)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showRuler"),			m_oShowRuler)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showWhiteSpace"),		m_oShowWhiteSpace)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("showZeros"),			m_oShowZeros)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("tabSelected"),			m_oTabSelected)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("topLeftCell"),			m_oTopLeftCell)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("view"),				m_oView)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("windowProtection"),	m_oWindowProtection)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("workbookViewId"),		m_oWorkbookViewId)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScale"),			m_oZoomScale)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScaleNormal"),		m_oZoomScaleNormal)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScalePageLayoutView"),		m_oZoomScalePageLayoutView)
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("zoomScaleSheetLayoutView"),	m_oZoomScaleSheetLayoutView)		
+				WritingElement_ReadAttributes_End( oReader )
 			}
 
 		public:
@@ -606,7 +589,7 @@ namespace OOX
 				nullable<SimpleTypes::COnOff<>>						m_oShowWhiteSpace;
 				nullable<SimpleTypes::COnOff<>>						m_oShowZeros;
 				nullable<SimpleTypes::COnOff<>>						m_oTabSelected;
-				nullable<std::wstring>									m_oTopLeftCell;
+				nullable<std::wstring>								m_oTopLeftCell;
 				nullable<SimpleTypes::Spreadsheet::CSheetViewType<>>m_oView;
 				nullable<SimpleTypes::COnOff<>>						m_oWindowProtection;
 				nullable<SimpleTypes::CUnsignedDecimalNumber<>>		m_oWorkbookViewId;
@@ -746,12 +729,12 @@ namespace OOX
 		public:
 			nullable<CColor>					m_oTabColor;
 
-			nullable<std::wstring>					m_oCodeName;
+			nullable<std::wstring>				m_oCodeName;
 			nullable<SimpleTypes::COnOff<>>		m_oEnableFormatConditionsCalculation;
 			nullable<SimpleTypes::COnOff<>>		m_oFilterMode;
 			nullable<SimpleTypes::COnOff<>>		m_oPublished;
 			nullable<SimpleTypes::COnOff<>>		m_oSyncHorizontal;
-			nullable<std::wstring>					m_oSyncRef;
+			nullable<std::wstring>				m_oSyncRef;
 			nullable<SimpleTypes::COnOff<>>		m_oSyncVertical;
 			nullable<SimpleTypes::COnOff<>>		m_oTransitionEntry;
 			nullable<SimpleTypes::COnOff<>>		m_oTransitionEvaluation;
@@ -1070,10 +1053,8 @@ namespace OOX
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
 				WritingElement_ReadAttributes_Start( oReader )
-
-					WritingElement_ReadAttributes_Read_if     ( oReader, _T("r:id"),      m_oId )
-
-					WritingElement_ReadAttributes_End( oReader )
+					WritingElement_ReadAttributes_Read_if     ( oReader, _T("r:id"), m_oId )
+				WritingElement_ReadAttributes_End( oReader )
 			}
 		public:
 			nullable<SimpleTypes::CRelationshipId > m_oId;