.....

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

ASCOfficeOdfFile/src/docx/xlsx_textcontext.cpp

@@ -215,7 +215,9 @@ void xlsx_text_context::Impl::set_cell_text_properties(odf_reader::text_format_p
 
 void xlsx_text_context::Impl::write_rPr(std::wostream & strm)
 {
-	if (paragraph_style_name_.length()<1 && span_style_name_.length()<1 && !(hyperlink_hId.length()>0 && in_draw) )return;
+	if (paragraph_style_name_.length()<1 && span_style_name_.length()<1 
+			&& !(hyperlink_hId.length()>0	&& in_draw) 
+			&& !(text_properties_cell_		&& in_cell_content))return;
 
 	odf_reader::text_format_properties_content		text_properties_paragraph_;	
 	odf_reader::text_format_properties_content		text_properties_span_;

ASCOfficeOdfFile/src/odf/table.h

@@ -391,7 +391,7 @@ public:
     void add_child_element( xml::sax * Reader, const ::std::wstring & Ns, const ::std::wstring & Name, document_context * Context);
     
     bool	docx_convert(oox::docx_conversion_context & Context) ;
-    int		xlsx_convert(oox::xlsx_conversion_context & Context, text_format_properties_content & text_properties) ;
+    int		xlsx_convert(oox::xlsx_conversion_context & Context, text_format_properties_content *text_properties) ;
     bool	pptx_convert(oox::pptx_conversion_context & Context) ;
 
 private:

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -28,7 +28,7 @@ namespace odf_reader {
 static formulasconvert::odf2oox_converter formulas_converter;
 
 
-int table_table_cell_content::xlsx_convert(oox::xlsx_conversion_context & Context, text_format_properties_content & text_properties) 
+int table_table_cell_content::xlsx_convert(oox::xlsx_conversion_context & Context, text_format_properties_content *text_properties) 
 {
     Context.get_table_context().start_cell_content();
 	Context.get_text_context().set_cell_text_properties(text_properties);
@@ -691,7 +691,7 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
         
 		xfId_last_set= Context.get_style_manager().xfId(&textFormatProperties, &parFormatProperties, &cellFormatProperties, &cellFormat, num_format,false, is_style_visible);
        
-		const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, textFormatProperties);
+		const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, &textFormatProperties);
 
 		if (t_val == XlsxCellType::str && sharedStringId >=0) t_val = XlsxCellType::s;//  ,      
 		
@@ -787,7 +787,7 @@ void table_covered_table_cell::xlsx_convert(oox::xlsx_conversion_context & Conte
 {
     std::wostream & strm = Context.current_sheet().sheetData();
 
-	const int sharedStringId = table_table_cell_content_.xlsx_convert(Context);
+	const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, NULL);
     
 	for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
     {