Commit 5109acb8 authored by ElenaSubbotina's avatar ElenaSubbotina

Revert "DocFormatReader - users file fix"

This reverts commit cbc4a5d3.
parent cbc4a5d3
...@@ -87,8 +87,8 @@ namespace DocFileFormat ...@@ -87,8 +87,8 @@ namespace DocFileFormat
case sprmOldTDefTable: case sprmOldTDefTable:
case sprmTDefTable: case sprmTDefTable:
{ { //table definition
//table definition
SprmTDefTable tDef( iter->Arguments, iter->argumentsSize ); SprmTDefTable tDef( iter->Arguments, iter->argumentsSize );
//Workaround for retrieving the indent of the table: //Workaround for retrieving the indent of the table:
//In some files there is a indent but no sprmTWidthIndent is set. //In some files there is a indent but no sprmTWidthIndent is set.
......
...@@ -866,14 +866,12 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio ...@@ -866,14 +866,12 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
if (attlists_.rel_size_.style_rel_width_) if (attlists_.rel_size_.style_rel_width_)
{ {
int type = attlists_.rel_size_.style_rel_width_->get_type(); int type = attlists_.rel_size_.style_rel_width_->get_type();
if (type == odf_types::percent_or_scale::Percent) if (type == odf_types::percent_or_scale::Percent)
drawing.pctWidth = attlists_.rel_size_.style_rel_width_->get_percent().get_value(); drawing.pctWidth = attlists_.rel_size_.style_rel_width_->get_percent().get_value();
} }
if (attlists_.rel_size_.style_rel_height_ ) if (attlists_.rel_size_.style_rel_height_ )
{ {
int type = attlists_.rel_size_.style_rel_height_->get_type(); int type = attlists_.rel_size_.style_rel_height_->get_type();
if (type == odf_types::percent_or_scale::Percent) if (type == odf_types::percent_or_scale::Percent)
drawing.pctHeight = attlists_.rel_size_.style_rel_height_->get_percent().get_value(); drawing.pctHeight = attlists_.rel_size_.style_rel_height_->get_percent().get_value();
} }
......
...@@ -115,17 +115,17 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex ...@@ -115,17 +115,17 @@ void table_format_properties::docx_convert(oox::docx_conversion_context & Contex
if (style_rel_width_) if (style_rel_width_)
{ {
int w_w = (int)(0.5 + 50.0 * style_rel_width_->get_value()); 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_) else if (style_width_)
{ {
int w_w = (int)(0.5 + 20.0 * style_width_->get_value_unit(length::pt)); int w_w = (int)(0.5 + 20.0 * style_width_->get_value_unit(length::pt));
if (w_w > 31680)w_w = 31680; 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 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_) if (common_break_attlist_.fo_break_before_)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment