DocFormatReader - users file fix

OdfFormatReader - fix alphabetic text index

ASCOfficeDocFile/DocDocxConverter/TablePropertiesMapping.cpp

@@ -87,8 +87,8 @@ namespace DocFileFormat
 
 				case sprmOldTDefTable:
 				case sprmTDefTable:
-				{				//table definition
-
+				{
+	//table definition
 					SprmTDefTable tDef( iter->Arguments, iter->argumentsSize );
 					//Workaround for retrieving the indent of the table:
 					//In some files there is a indent but no sprmTWidthIndent is set.

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -866,12 +866,14 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
 		if (attlists_.rel_size_.style_rel_width_)
 		{
 			int type = attlists_.rel_size_.style_rel_width_->get_type();
+			
 			if (type == odf_types::percent_or_scale::Percent)
 				drawing.pctWidth	= attlists_.rel_size_.style_rel_width_->get_percent().get_value();
 		}
 		if (attlists_.rel_size_.style_rel_height_ )
 		{
 			int type = attlists_.rel_size_.style_rel_height_->get_type();
+			
 			if (type == odf_types::percent_or_scale::Percent)
 				drawing.pctHeight	= attlists_.rel_size_.style_rel_height_->get_percent().get_value();
 		}

ASCOfficeOdfFile/src/odf/style_table_properties.cpp

@@ -115,17 +115,17 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
     if (style_rel_width_)
     {
         int w_w = (int)(0.5 + 50.0 * style_rel_width_->get_value());
-        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"" <<  w_w << "\" />";
+        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"" <<  w_w << "\"/>";
     }
     else if (style_width_)
     {
         int w_w = (int)(0.5 + 20.0 * style_width_->get_value_unit(length::pt));
  		if (w_w > 31680)w_w = 31680;
-       _tblPr << L"<w:tblW w:type=\"dxa\" w:w=\"" <<  w_w << "\" />";
+       _tblPr << L"<w:tblW w:type=\"dxa\" w:w=\"" <<  w_w << "\"/>";
     }
     else
     {
-        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"5000\" />";
+        _tblPr << L"<w:tblW w:type=\"pct\" w:w=\"5000\"/>";
     }
 
     if (common_break_attlist_.fo_break_before_)