мержи, сплиты, стили таблиц

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

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.cpp

@@ -22,6 +22,10 @@ namespace cpdoccore
 {
 namespace odf
 {
+	struct odf_column_state : odf_element_state
+	{
+		std::vector<office_element_ptr>	spanned_row_cell;
+	};
 	struct odf_table_state
 	{
 		odf_table_state()
@@ -29,10 +33,9 @@ namespace odf
 			current_row = 0;
 			current_column = 0;
 			count_header_row = 0;
-			current_spanned_row = 0;
 		}
 		std::vector<odf_element_state> rows;
-		std::vector<odf_element_state> columns;
+		std::vector<odf_column_state> columns;
 		std::vector<odf_element_state> cells;
 
 		odf_element_state table;
@@ -42,7 +45,6 @@ namespace odf
 
 		__int32 count_header_row;
 
-		__int32 current_spanned_row;
 	};
 
 class odf_table_context::Impl
@@ -61,9 +63,12 @@ public:
 	void end_table() {if (tables_.size() > 0) tables_.pop_back();}
 
 	odf_style_context	* styles_context() {return odf_context_->styles_context();}
+
+	//std::wstring default_cell_style_name_ ; //  :(    
+	odf_conversion_context *odf_context_; 
+
 private:
 	std::vector<odf_table_state> tables_;// current level ...   
-	odf_conversion_context *odf_context_; 
 
 };
 
@@ -94,6 +99,10 @@ void odf_table_context::start_table(office_element_ptr &elm, bool styled)
 			state.table.style_elm = style_state->get_office_element();
 			state.table.style_name = style_state->get_name();
 			table->table_table_attlist_.table_style_name_ = state.table.style_name;		
+			
+			//     -      
+			style_table_properties *table_properties = style_state->get_table_properties();
+			table_properties->table_format_properties_.table_border_model_ = odf::border_model(odf::border_model::Collapsing);
 		}
 	}
 
@@ -101,6 +110,12 @@ void odf_table_context::start_table(office_element_ptr &elm, bool styled)
 }
 void odf_table_context::end_table()
 {
+	//     .. 
+	for (long i =0 ; i < impl_->current_table().columns.size(); i++)
+	{
+		impl_->current_table().current_column = i+1;
+		set_cell_row_span_restart();
+	}
 	impl_->end_table(); 
 }
 void odf_table_context::start_row(office_element_ptr &elm, bool styled)
@@ -124,6 +139,7 @@ void odf_table_context::start_row(office_element_ptr &elm, bool styled)
 		}
 	}
 
+
 	impl_->current_table().rows.push_back(state);
 
 	impl_->current_table().current_column =0;
@@ -133,8 +149,19 @@ void odf_table_context::start_row(office_element_ptr &elm, bool styled)
 void odf_table_context::end_row()
 {
 	if (impl_->empty()) return;
+	
+	//for (int i = impl_->current_table().current_column ; i< impl_->current_table().columns.size() ; i++)
+	//{
+	//	office_element_ptr cell; //  default ???
+	//	create_element(L"table", L"table-cell",cell , impl_->odf_context_);
+	//	start_cell(cell,false);
+	//	end_cell();
+	//}
+	impl_->current_table().current_column =0;
 }
 
+
+
 void odf_table_context::add_column(office_element_ptr &elm, bool styled)
 {
 	if (impl_->empty()) return;
@@ -142,7 +169,7 @@ void odf_table_context::add_column(office_element_ptr &elm, bool styled)
 	table_table_column * column = dynamic_cast<table_table_column *>(elm.get());;
 	if (!column)return;
 
-	odf_element_state state;
+	odf_column_state state;
 
 	state.elm = elm;
 	if (styled)
@@ -178,17 +205,31 @@ void odf_table_context::set_column_width(double width)
 	else
 		properties->style_table_column_properties_attlist_.style_use_optimal_column_width_ = true;
 }
+int odf_table_context::current_column ()
+{
+	if (impl_->empty()) return 0;
+	
+	return impl_->current_table().current_column;
+}
+int odf_table_context::count_column ()
+{
+	if (impl_->empty()) return 0;
+
+	return impl_->current_table().columns.size();
+
+}
 void odf_table_context::start_cell(office_element_ptr &elm, bool styled)
 {
 	if (impl_->empty()) return;
 
 	table_table_cell * cell = dynamic_cast<table_table_cell *>(elm.get());;
-	if (!cell)return;
+	table_covered_table_cell * covered_cell = dynamic_cast<table_covered_table_cell *>(elm.get());;
+	if (!cell && !covered_cell)return;
 	
 	odf_element_state state;
 
 	state.elm = elm;
-	if (styled)
+	if (styled && cell)
 	{
 		odf_style_state * style_state = impl_->styles_context()->last_state(style_family::TableCell);
 		if (style_state)
@@ -203,7 +244,7 @@ void odf_table_context::start_cell(office_element_ptr &elm, bool styled)
 
 	impl_->current_table().current_column++;
 }
-void odf_table_context::set_cell_spanned(int spanned)
+void odf_table_context::set_cell_column_span(int spanned)
 {
 	if (impl_->empty()) return;
 	if (impl_->current_table().cells.size() < 1)return;
@@ -214,10 +255,37 @@ void odf_table_context::set_cell_spanned(int spanned)
 
 	cell->table_table_cell_attlist_extra_.table_number_columns_spanned_ = spanned;
 
-	impl_->current_table().current_column += spanned-1;
+	//impl_->current_table().current_column += spanned-1;
 				
-	//cell_elm->table_table_cell_attlist_extra_.table_number_rows_spanned_ = spanned_rows;	
 }
+
+void odf_table_context::set_cell_row_span()
+{
+	int col = impl_->current_table().current_column-1;
+	odf_column_state & state = impl_->current_table().columns[col];
+
+	state.spanned_row_cell.push_back(impl_->current_table().cells.back().elm);
+}
+
+void odf_table_context::set_cell_row_span_restart()
+{
+	int col = impl_->current_table().current_column-1;
+	odf_column_state & state = impl_->current_table().columns[col];
+
+	int sz = state.spanned_row_cell.size();
+	
+	if (sz  > 1)
+	{
+		table_table_cell * cell = dynamic_cast<table_table_cell *>(state.spanned_row_cell[0].get());
+		if (!cell)return;
+
+		cell->table_table_cell_attlist_extra_.table_number_rows_spanned_ = sz;
+	}
+	state.spanned_row_cell.clear();
+	state.spanned_row_cell.push_back(impl_->current_table().cells.back().elm);
+
+}
+
 void odf_table_context::end_cell()
 {
 	if (impl_->empty()) return;

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.h

@@ -23,6 +23,9 @@ public:
 
 	void set_styles_context(odf_style_context*  styles_context);
 
+	int current_column ();
+	int count_column ();
+
 	void start_table(office_element_ptr &elm, bool styled = false);
 	void end_table();
 
@@ -30,12 +33,16 @@ public:
 	void end_row();
 
 	void start_cell(office_element_ptr &elm, bool styled = false);
-		void set_cell_spanned(int spanned);
+		void set_cell_column_span(int spanned);
+		void set_cell_row_span();
+		void set_cell_row_span_restart();	
 	void end_cell();
 
 	void add_column(office_element_ptr &elm, bool styled = false);
 		void set_column_width(double width);
 
+
+
 private:
 
     class Impl;

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp

@@ -530,15 +530,22 @@ void odt_conversion_context::start_table_row(bool styled)
 	table_context()->start_row(elm, styled);
 
 }
-void odt_conversion_context::start_table_cell(int col, int spanned, bool styled)
+void odt_conversion_context::start_table_cell(int col, bool covered, bool styled)
 {
+	for (int i=table_context()->current_column() ; i < col;  i++)
+	{
+		add_default_cell();
+	}
+//-------------------------------------------------------
 	office_element_ptr elm;
-	create_element(L"table", L"table-cell",elm,this);
+	if (covered)
+		create_element(L"table", L"covered-table-cell",elm,this);
+	else
+		create_element(L"table", L"table-cell",elm,this);
+
 
 	table_context()->start_cell(elm, styled);
 	text_context()->start_element(elm);
-	table_context()->set_cell_spanned(spanned);
-	
 }
 void odt_conversion_context::end_table_cell()
 {
@@ -547,9 +554,26 @@ void odt_conversion_context::end_table_cell()
 }
 void odt_conversion_context::end_table_row()
 {
+	for (int i=table_context()->current_column() ; i < table_context()->count_column(); i++)
+	{
+		add_default_cell();
+	}
+//---------------------------------------------
 	table_context()->end_row();
 	text_context()->end_element();
 }
+
+void odt_conversion_context::add_default_cell()
+{
+	office_element_ptr elm;
+	create_element(L"table", L"covered-table-cell",elm,this);
+
+	table_context()->start_cell(elm, false);
+	text_context()->start_element(elm);
+
+	table_context()->end_cell();
+	text_context()->end_element();
+}
 void odt_conversion_context::end_table()
 {
 	table_context()->end_table();

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h

@@ -83,7 +83,8 @@ public:
 		void start_table_header_rows();
 		void end_table_header_rows();
 		void start_table_row(bool styled = false);
-			void start_table_cell(int col, int spanned = 1, bool styled = false);
+			void add_default_cell();
+			void start_table_cell(int col, bool covered, bool styled = false);
 			void end_table_cell();
 		void end_table_row();
 	void end_table();

ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.cpp

@@ -155,11 +155,6 @@ void paragraph_format_properties::serialize(std::wostream & _Wostream ,const wch
 			CP_XML_ATTR_OPT(L"fo:break-before", fo_break_before_);
 			CP_XML_ATTR_OPT(L"fo:break-after", fo_break_after_);
 			CP_XML_ATTR_OPT(L"fo:background-color", fo_background_color_);
-			CP_XML_ATTR_OPT(L"fo:border", fo_border_);
-			CP_XML_ATTR_OPT(L"fo:border-top", fo_border_top_);
-			CP_XML_ATTR_OPT(L"fo:border-bottom", fo_border_bottom_);
-			CP_XML_ATTR_OPT(L"fo:border-left", fo_border_left_);
-			CP_XML_ATTR_OPT(L"fo:border-right", fo_border_right_);
 			CP_XML_ATTR_OPT(L"style:border-line-width", style_border_line_width_);
 			CP_XML_ATTR_OPT(L"style:border-line-width-top", style_border_line_width_top_);
 			CP_XML_ATTR_OPT(L"style:border-line-width-bottom", style_border_line_width_bottom_);
@@ -182,7 +177,10 @@ void paragraph_format_properties::serialize(std::wostream & _Wostream ,const wch
 			CP_XML_ATTR_OPT(L"style:writing-mode-automatic", style_writing_mode_automatic_);
 			CP_XML_ATTR_OPT(L"style:snap-to-layout-grid", style_snap_to_layout_grid_);
 			CP_XML_ATTR_OPT(L"style:contextual-spacing", style_contextual_spacing_);
+			CP_XML_ATTR_OPT(L"style:background-transparency", style_background_transparency_);
+			CP_XML_ATTR_OPT(L"style:join_border", style_join_border_);
 		
+			common_border_attlist_.serialize(CP_GET_XML_NODE());
 			//_CP_OPT(std::wstring) style_page_number_str_;
 			//CP_XML_ATTR_OPT(L"style:page-number", style_page_number_str_);
 
@@ -193,8 +191,6 @@ void paragraph_format_properties::serialize(std::wostream & _Wostream ,const wch
 			//		style_page_number_=  boost::lexical_cast<int>(style_page_number_str_.get());
 			//}
 
-			CP_XML_ATTR_OPT(L"style:background-transparency", style_background_transparency_);
-			CP_XML_ATTR_OPT(L"style:join_border", style_join_border_);
 
 			if (style_tab_stops_)		style_tab_stops_->serialize(CP_XML_STREAM());
 			if (style_drop_cap_)		style_drop_cap_->serialize(CP_XML_STREAM());
@@ -258,12 +254,9 @@ void paragraph_format_properties::apply_from(paragraph_format_properties & Other
     // TODO
     _CP_APPLY_PROP(style_background_image_, Other.style_background_image_);
 
-    _CP_APPLY_PROP(fo_border_, Other.fo_border_);
-    _CP_APPLY_PROP(fo_border_top_, Other.fo_border_top_);
-    _CP_APPLY_PROP(fo_border_bottom_, Other.fo_border_bottom_);
-    _CP_APPLY_PROP(fo_border_left_, Other.fo_border_left_);
-    _CP_APPLY_PROP(fo_border_right_, Other.fo_border_right_);
-    _CP_APPLY_PROP(style_border_line_width_, Other.style_border_line_width_);
+	common_border_attlist_.apply_from(Other.common_border_attlist_);
+
+	_CP_APPLY_PROP(style_border_line_width_, Other.style_border_line_width_);
     _CP_APPLY_PROP(style_border_line_width_top_, Other.style_border_line_width_top_);
     _CP_APPLY_PROP(style_border_line_width_bottom_, Other.style_border_line_width_bottom_);
     _CP_APPLY_PROP(style_border_line_width_left_, Other.style_border_line_width_left_);

ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.h

@@ -249,21 +249,7 @@ public:
     // 15.5.24 <style:background-image>
     office_element_ptr style_background_image_;
 
-    // 15.5.25 fo:border
-    _CP_OPT(std::wstring) fo_border_;                // +
-
-    // fo:border-top
-    _CP_OPT(std::wstring) fo_border_top_;            // +
-
-    // fo:border-bottom
-    _CP_OPT(std::wstring) fo_border_bottom_;         // +
-
-    // fo:border-left
-    _CP_OPT(std::wstring) fo_border_left_;           // +
-
-    // fo:border-right
-    _CP_OPT(std::wstring) fo_border_right_;          // +
-
+	common_border_attlist common_border_attlist_;
     // 15.5.26
     // style:border-line-width
     _CP_OPT( border_widths ) style_border_line_width_;       // +

ASCOfficeOdfFileW/source/OdfFormat/style_table_properties.cpp

@@ -48,6 +48,7 @@ void table_format_properties::serialize(std::wostream & _Wostream,const wchar_t
 			common_background_color_attlist_.serialize(CP_GET_XML_NODE());
 			common_shadow_attlist_.serialize(CP_GET_XML_NODE());
 			common_keep_with_next_attlist_.serialize(CP_GET_XML_NODE());
+			common_border_attlist_.serialize(CP_GET_XML_NODE());
 			
 			if (style_background_image_) style_background_image_->serialize(_Wostream);
 		}

ASCOfficeOdfFileW/source/OdfFormat/style_table_properties.h

@@ -51,6 +51,8 @@ public:
     common_shadow_attlist				common_shadow_attlist_;
     common_keep_with_next_attlist		common_keep_with_next_attlist_;
     common_writing_mode_attlist			common_writing_mode_attlist_;
+	common_border_attlist				common_border_attlist_;
+
  
 	office_element_ptr style_background_image_;
 

ASCOfficeOdfFileW/source/OdfFormat/table.cpp

@@ -565,7 +565,7 @@ const wchar_t * table_table_row::name = L"table-row";
 void table_table_row::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
 {
     if ( CP_CHECK_NAME(L"table", L"table-cell") || 
-         CP_CHECK_NAME(L"table", L"covered-table-cell") )
+         CP_CHECK_NAME(L"table", L"table-covered-cell") )
     {
 		CP_CREATE_ELEMENT(content_);
     }

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h

@@ -14,15 +14,25 @@ namespace cpdoccore
 {
 	namespace odf 
 	{
-
 		class odf_conversion_context;
-		class font_size;
-		class length_or_percent;
+
 		class style_paragraph_properties;
 		class style_text_properties;
+		class style_graphic_properties;
+		class style_section_properties;
+		class style_table_properties;
+		class style_table_cell_properties;
+		class style_table_row_properties;
+		class style_table_column_properties;
+		class style_chart_properties;
+		class style_drawing_page_properties;
+
 		class color;
 		class length;
 		class text_align;
+		class font_size;
+		class length_or_percent;
+
 	}
 }
 namespace OOX

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.h

@@ -42,6 +42,8 @@ namespace OOX
 		class CTableCellProperties;
 		class CTableProperty;
 		class CTableRowProperties;
+		class CTcBorders;
+		class CTblBorders;
 
 	}
 
@@ -104,7 +106,6 @@ namespace Oox2Odf
 		void convert(OOX::Logic::CParagraph				*oox_paragraph);
 		void convert(OOX::Logic::CRun					*oox_run);
 		void convert(OOX::Logic::CParagraphProperty		*oox_paragraph_prop,	odf::style_paragraph_properties *paragraph_properties);
-		void convert(OOX::Logic::CPBdr					*oox_border,			odf::style_paragraph_properties *paragraph_properties);
 		void convert(ComplexTypes::Word::CFramePr		*oox_frame_pr,			odf::style_paragraph_properties *paragraph_properties);
 		void convert(OOX::Logic::CRunProperty			*oox_run_prop,			odf::style_text_properties		*text_properties);
 		void convert(ComplexTypes::Word::CShading		*oox_shading,			odf::style_text_properties		*text_properties );
@@ -127,6 +128,10 @@ namespace Oox2Odf
 		void convert(ComplexTypes::Word::CJc			*oox_jc,		_CP_OPT(odf::text_align)		& align);
 		void convert(ComplexTypes::Word::CBorder		*borderProp,	std::wstring & odf_border_prop);
 		
+		void convert(OOX::Logic::CPBdr					*oox_border,			odf::style_paragraph_properties		*paragraph_properties);
+		void convert(OOX::Logic::CTcBorders 			*oox_border,			odf::style_table_cell_properties	*table_cell_properties);
+		void convert(OOX::Logic::CTblBorders			*oox_border,			odf::style_table_cell_properties	*table_cell_properties);
+		//void convert(OOX::Logic::CTblBorders			*oox_border,			odf::style_table_properties			*table_properties);
 
 		void convert(SimpleTypes::CHexColor<>			*color, SimpleTypes::CThemeColor<>	*theme_color, 
 														SimpleTypes::CUcharHexNumber<>* theme_tint,
@@ -144,8 +149,11 @@ namespace Oox2Odf
 		void convert(OOX::Logic::CTc					*oox_table_cell);
 		
 		bool convert(OOX::Logic::CTableCellProperties	*oox_table_cell_pr);
+		bool convert(OOX::Logic::CTableCellProperties	*oox_table_cell_pr,	odf::style_table_cell_properties	*table_cell_properties/*,odf::style_table_cell_properties	* table_cell_properties = NULL*/);
 		bool convert(OOX::Logic::CTableProperty			*oox_table_pr);
+		bool convert(OOX::Logic::CTableProperty			*oox_table_pr,			odf::style_table_properties		*table_properties);
 		void convert(OOX::Logic::CTableRowProperties	*oox_table_row_pr);
+		void convert(OOX::Logic::CTableRowProperties	*oox_table_row_pr,		odf::style_table_row_properties	*table_row_properties);
 //--------------------------------------------------------------------------------
 		bool m_bKeepNextParagraph;
 	};

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h

@@ -71,17 +71,6 @@ namespace odf
 		class office_element;
 		typedef shared_ptr<office_element>::Type office_element_ptr;
 
-		class style_text_properties;
-		class style_paragraph_properties;
-		class style_graphic_properties;
-		class style_table_properties;
-		class style_section_properties;
-		class style_table_cell_properties;
-		class style_table_row_properties;
-		class style_table_column_properties;
-		class style_chart_properties;
-		class style_drawing_page_properties;
-
 		namespace package 
 		{		
 			class odf_document;