(1.0.1.181): ASCOfficeOdfFile

1. 22903
2. реализованы в эл. таблицах группы строк. 

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

ASCOfficeODFFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//179
-#define INTVER 1,0,1,179
-#define STRVER "1,0,1,179\0"
+//181
+#define INTVER 1,0,1,181
+#define STRVER "1,0,1,181\0"

ASCOfficeODFFile/src/docx/oox_drawing.cpp

@@ -317,7 +317,7 @@ void oox_serialize_xfrm(std::wostream & strm, _oox_drawing const & val, std::wst
 				CP_XML_ATTR(L"y", static_cast<size_t>(val.y));
 			}
 
-			if (val.cx >0 && val.cy >0)
+			if (val.cx >0 || val.cy >0)
 			{
 				CP_XML_NODE(L"a:ext")
 				{

ASCOfficeODFFile/src/docx/pptx_conversion_context.cpp

@@ -63,14 +63,14 @@ void pptx_conversion_context::process_layouts()
 
 	get_text_context().set_process_layouts(true);
 
-	//áåðåì òîëüêî àêòóàëüíûå
+	//àêòóàëüíûå
 	for (int layout_index =0; layout_index < layouts.content.size(); layout_index++)
 	{
 		start_layout(layout_index);
 
 		odf::style_presentation_page_layout * layout = 
 			root()->odf_context().pageLayoutContainer().presentation_page_layout_by_name(layouts.content[layout_index].layout_name);
-		
+
 		if (layout)
 		{
 			layout->pptx_convert(*this);
@@ -381,22 +381,30 @@ bool pptx_conversion_context::start_page(const std::wstring & pageName,	const st
 
 bool pptx_conversion_context::start_layout(int layout_index)
 {
-	odf::presentation_layouts_instance & layouts = root()->odf_context().styleContainer().presentation_layouts();
+	if  (layout_index >=0)
+	{
+		odf::presentation_layouts_instance & layouts = root()->odf_context().styleContainer().presentation_layouts();
 
-	create_new_slideLayout(layouts.content[layout_index].Id);
-	
-	get_slide_context().start_slide();//layouts.content[layout_index].layout_name, L"");//?????
+		create_new_slideLayout(layouts.content[layout_index].Id);
+		
+		get_slide_context().start_slide();//layouts.content[layout_index].layout_name, L"");//?????
 
-	current_master_page_name_ = layouts.content[layout_index].master_name;
-	current_layout_page_name_ = L"";
-	
-	std::pair<int,std::wstring> master_id = //std::pair<int,std::wstring>(1,L"smId1");
-			root()->odf_context().styleContainer().presentation_masters().add_or_find(layouts.content[layout_index].master_name);
+		current_master_page_name_ = layouts.content[layout_index].master_name;
+		current_layout_page_name_ = L"";
+		
+		std::pair<int,std::wstring> master_id = //std::pair<int,std::wstring>(1,L"smId1");
+				root()->odf_context().styleContainer().presentation_masters().add_or_find(layouts.content[layout_index].master_name);
+
+		root()->odf_context().styleContainer().presentation_masters().add_layout_to(layouts.content[layout_index].master_name,layouts.content[layout_index]);
 
-	root()->odf_context().styleContainer().presentation_masters().add_layout_to(layouts.content[layout_index].master_name,layouts.content[layout_index]);
+		current_layout().Rels().add(relationship(L"smId1"/*master_id.second*/, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster",
+			std::wstring(L"../slideMasters/slideMaster")  + boost::lexical_cast<std::wstring>(master_id.first) + L".xml"));
 
-	current_layout().Rels().add(relationship(L"smId1"/*master_id.second*/, L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster",
-		std::wstring(L"../slideMasters/slideMaster")  + boost::lexical_cast<std::wstring>(master_id.first) + L".xml"));
+		//
+	}
+	else//îáùèé øàáëîí (íàñèëüíî ïðîïèøåì ê òåìàì íåñîîòâåòñòâóþùèå øàëîíû)
+	{
+	}
 
 //layout type
 

ASCOfficeODFFile/src/odf/draw_frame_docx.cpp

@@ -967,14 +967,8 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 	oox::_docx_drawing drawing = oox::_docx_drawing();
-	drawing.fill.bitmap = oox::oox_bitmap_fill::create();
-	drawing.fill.type = 2;
 	drawing.type = oox::mediaitems::typeImage;
 
-	drawing.fill.bitmap->isInternal = false;
-    drawing.fill.bitmap->rId = Context.add_mediaitem(href, oox::mediaitems::typeImage,drawing.fill.bitmap->isInternal,href);
-	drawing.fill.bitmap->bStretch = true;
-
 	drawing.id = Context.get_drawing_context().get_current_frame_id();
 	drawing.name = Context.get_drawing_context().get_current_object_name();
 //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -993,6 +987,11 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 /////////
 	common_draw_docx_convert(Context, frame->common_draw_attlists_, drawing);
 /////////
+	drawing.fill.bitmap = oox::oox_bitmap_fill::create();
+	drawing.fill.type = 2;
+	drawing.fill.bitmap->isInternal = false;
+    drawing.fill.bitmap->rId = Context.add_mediaitem(href, oox::mediaitems::typeImage,drawing.fill.bitmap->isInternal,href);
+	drawing.fill.bitmap->bStretch = true;
 
     const _CP_OPT(style_ref) & styleRef = frame->common_draw_attlists_.shape_with_text_and_styles_.
         common_draw_shape_with_styles_attlist_.

ASCOfficeODFFile/src/odf/table.h

@@ -641,6 +641,7 @@ public:
     table_table_row_group() 
 	{
     }
+	virtual void xlsx_convert(oox::xlsx_conversion_context & Context) ;
 
 public:
     virtual ::std::wostream & text_to_stream(::std::wostream & _Wostream) const;

ASCOfficeODFFile/src/odf/table_xlsx.cpp

@@ -205,6 +205,11 @@ void table_rows_and_groups::xlsx_convert(oox::xlsx_conversion_context & Context)
     }
 }
 
+void table_table_row_group::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+	table_rows_and_groups_.xlsx_convert(Context);
+}
+
 void table_table::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
     const std::wstring tableStyleName = table_table_attlist_.table_style_name_ ? table_table_attlist_.table_style_name_->style_name() : L"";