поправлен demo.docx - данные для chart берутся из кэша (убрана проверка на втроенные табл), ...

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

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -92,7 +92,7 @@ public:
     {	
 		styles_context_ = NULL;
 		current_series_count_= 0;
-		local_table_enabled_ = false;
+		local_table_enabled_ = true;// false; -    .. demo.docx
 		
 	} 
 
@@ -164,7 +164,7 @@ void odf_chart_context::Impl::clear_current()
 	cash_.clear();
 
 	current_series_count_ = 0;
-	local_table_enabled_ = false;
+	local_table_enabled_ = true; //false;    - demo.docx
 }
 void odf_chart_context::Impl::set_default_series_color()
 {
@@ -1428,8 +1428,10 @@ void odf_chart_context::Impl::create_local_table_rows(ods_table_state * table_st
 
     office_element_ptr style_null;
 
+	bool add = false;
     for (long i = 0; i< cells.size(); i++)
     {
+		add = false;
 		if (cells[i].row  > curr_row+1)
 		{	
 			office_element_ptr row_elm;
@@ -1437,10 +1439,11 @@ void odf_chart_context::Impl::create_local_table_rows(ods_table_state * table_st
             create_element(L"table", L"table-row",row_elm, odf_context_);
             table_state->add_row(row_elm,cells[i].row - curr_row -2, style_null);
 			curr_row =  cells[i].row-1;
+			add = true;
 		}
 		if (cells[i].row == curr_row+1)
 		{
-			if (cells[i].label == header)
+			if (cells[i].label == header && !add)
 			{
 				office_element_ptr row_elm;
 

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -1847,7 +1847,7 @@ void odf_drawing_context::end_text_box()
 	{
 		draw->draw_text_box_attlist_.fo_min_height_= impl_->current_drawing_state_.svg_height_;
 	}
-	impl_->current_drawing_state_.svg_height_ = boost::none;///????
+	//impl_->current_drawing_state_.svg_height_ = boost::none;///??? demo.docx
 	
 	end_element();
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -357,6 +357,12 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
 		}
 		if (oox_paragraph->m_oParagraphProperty->m_oNumPr.IsInit())
 		{
+			if (bStartNewParagraph == false)//demo.docx
+			{
+				odt_context->end_paragraph();
+				odt_context->text_context()->set_KeepNextParagraph(false);
+				bStartNewParagraph = true; 
+			}
 			list_present = true;
 		
 			if (oox_paragraph->m_oParagraphProperty->m_oNumPr->m_oIlvl.IsInit() && oox_paragraph->m_oParagraphProperty->m_oNumPr->m_oIlvl->m_oVal.IsInit())
@@ -644,7 +650,11 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty	*oox_paragraph_pr, cp
 			if (length && rule == SimpleTypes::linespacingruleExact)
 				paragraph_properties->content().fo_line_height_ = odf_types::line_width(*length);
 			else if (length)
-				paragraph_properties->content().style_line_height_at_least_= length;
+			{
+				odf_types::percent percent(100);
+				paragraph_properties->content().fo_line_height_ = percent;
+				//paragraph_properties->content().style_line_height_at_least_= length;
+			}
 		}
 		if (oox_paragraph_pr->m_oSpacing->m_oAfter.IsInit())
 		{