Commit 3870c929 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

фикс бага ods

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63010 954022d7-b5bf-4e40-9824-e11837661b57
parent 79f8054e
...@@ -391,10 +391,18 @@ void xlsx_drawing_context::process_common_properties(drawing_object_description ...@@ -391,10 +391,18 @@ void xlsx_drawing_context::process_common_properties(drawing_object_description
if (pic.svg_rect_) if (pic.svg_rect_)
{ {
drawing.x = (int)(0.5 + odf_types::length(pic.svg_rect_.get().x_, odf_types::length::pt).get_value_unit(odf_types::length::emu)); //todooo
drawing.y = (int)(0.5 + odf_types::length(pic.svg_rect_.get().y_, odf_types::length::pt).get_value_unit(odf_types::length::emu)); int val = 0.5 + odf_types::length(pic.svg_rect_.get().x_, odf_types::length::pt).get_value_unit(odf_types::length::emu);
drawing.cx = (int)(0.5 + odf_types::length(pic.svg_rect_.get().width_, odf_types::length::pt).get_value_unit(odf_types::length::emu)); if (val >=0) drawing.x = val;
drawing.cy = (int)(0.5 + odf_types::length(pic.svg_rect_.get().height_, odf_types::length::pt).get_value_unit(odf_types::length::emu));
val = 0.5 + odf_types::length(pic.svg_rect_.get().y_, odf_types::length::pt).get_value_unit(odf_types::length::emu);
if (val >=0) drawing.y = val;
val = 0.5 + odf_types::length(pic.svg_rect_.get().width_, odf_types::length::pt).get_value_unit(odf_types::length::emu);
if (val >=0) drawing.cx = val;
val = .5 + odf_types::length(pic.svg_rect_.get().height_, odf_types::length::pt).get_value_unit(odf_types::length::emu);
if (val >=0) drawing.cy = val;
} }
drawing.additional=pic.additional_; drawing.additional=pic.additional_;
......
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