Skip to content

O
onlyoffice_core
Commit 11d85322 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

(1.2.0.130): ASCOfficeOdfFileW 


git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57849 954022d7-b5bf-4e40-9824-e11837661b57
parent e6f9d6de
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 36 deletions
ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp
View file @ 11d85322
......@@ -586,6 +586,10 @@ void odf_drawing_context::start_shape(int type)
{
impl_->create_draw_base(7);// .. path,
}
else if (type == 1001)
{
impl_->create_draw_base(6);// .. path,
}
else if (type == 2000)
{
start_text_box();
......@@ -611,10 +615,12 @@ void odf_drawing_context::end_shape()
draw_path* path = dynamic_cast<draw_path*>(impl_->current_drawing_state_.elements_[0].elm.get());
if (path)
{
if (impl_->current_drawing_state_.path_.length()>1)
path->draw_path_attlist_.svg_d_ = impl_->current_drawing_state_.path_;
if (impl_->current_drawing_state_.view_box_.length()>1)
path->draw_path_attlist_.svg_viewbox_ = impl_->current_drawing_state_.view_box_;
if (impl_->current_drawing_state_.view_box_.length() < 1 && impl_->current_drawing_state_.svg_width_ && impl_->current_drawing_state_.svg_height_)
set_viewBox( impl_->current_drawing_state_.svg_width_->get_value_unit(length::cm) * 1000,
impl_->current_drawing_state_.svg_height_->get_value_unit(length::cm) *1000);
if (impl_->current_drawing_state_.path_.length()>1) path->draw_path_attlist_.svg_d_ = impl_->current_drawing_state_.path_;
if (impl_->current_drawing_state_.view_box_.length()>1) path->draw_path_attlist_.svg_viewbox_ = impl_->current_drawing_state_.view_box_;
}
////////////////////////////////////////////////////////////////////////////////////
draw_connector* connector = dynamic_cast<draw_connector*>(impl_->current_level_.back().get());
......@@ -636,6 +642,8 @@ void odf_drawing_context::end_shape()
if (impl_->current_drawing_state_.svg_height_)
connector->draw_line_attlist_.svg_y2_ = connector->draw_line_attlist_.svg_y2_.get() + impl_->current_drawing_state_.svg_height_.get();
impl_->current_drawing_state_.svg_height_ = boost::none;
}
////////////////////////////////////////////////////////////////////////////////////////////
draw_line* line = dynamic_cast<draw_line*>(impl_->current_level_.back().get());
......@@ -649,6 +657,8 @@ void odf_drawing_context::end_shape()
if (impl_->current_drawing_state_.svg_y_ && impl_->current_drawing_state_.svg_height_)
line->draw_line_attlist_.svg_y2_ = impl_->current_drawing_state_.svg_y_.get() + impl_->current_drawing_state_.svg_height_.get();
impl_->current_drawing_state_.svg_height_ = boost::none;
}
//////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -916,6 +926,13 @@ void odf_drawing_context::set_z_order(int id)
impl_->current_drawing_state_.z_order_ =id;
}
void odf_drawing_context::set_path(std::wstring path_string)
{
boost::replace_all(path_string, L",,", L" 0 ");
boost::replace_all(path_string, L" -", L"-");
boost::replace_all(path_string, L",", L"0"); //
impl_->current_drawing_state_.path_ = path_string;
}
void odf_drawing_context::add_path_element(std::wstring command, std::wstring & strE)
{
if (command != impl_->current_drawing_state_.path_last_command_)
......@@ -1004,11 +1021,19 @@ void odf_drawing_context::set_drawings_rect(_CP_OPT(double) x_pt, _CP_OPT(double
}
void odf_drawing_context::set_object_background(bool Val)
{
if (Val)impl_->anchor_settings_.run_through_ = run_through(run_through::Background);
if (Val)
{
impl_->anchor_settings_.run_through_ = run_through(run_through::Background);
impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
}
}
void odf_drawing_context::set_object_foreground(bool Val)
{
if (Val)impl_->anchor_settings_.run_through_ = run_through(run_through::Foreground);
if (Val)
{
impl_->anchor_settings_.run_through_ = run_through(run_through::Foreground);
impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);
}
}
void odf_drawing_context::set_margin_left (double valPt)
......@@ -1041,18 +1066,14 @@ void odf_drawing_context::set_vertical_rel(int from)
switch(from)
{
case 0: type = vertical_rel::Baseline; break;// relfromvBottomMargin ???
case 1: type = vertical_rel::PageContent; break;// relfromvInsideMargin ???
case 2: type = vertical_rel::Line; break;// relfromvLine
case 3: type = vertical_rel::PageContent; break;// relfromvMargin
case 4: type = vertical_rel::Baseline; break;// relfromvOutsideMargin ???
case 5: type = vertical_rel::Page;
set_anchor(anchor_type::Page); //??? /???
break;// relfromvPage
case 6: type = vertical_rel::Paragraph;
if (!impl_->is_footer_header_)set_anchor(anchor_type::Paragraph);
break;// relfromvParagraph
case 7: type = vertical_rel::Baseline; break;// relfromvTopMargin ???
case 0: type = vertical_rel::Baseline; break;// relfromvBottomMargin ???
case 1: type = vertical_rel::PageContent; break;// relfromvInsideMargin ???
case 2: type = vertical_rel::Line; break;// relfromvLine
case 3: type = vertical_rel::PageContent; break;// relfromvMargin
case 4: type = vertical_rel::Baseline; break;// relfromvOutsideMargin ???
case 5: type = vertical_rel::Page; set_anchor(anchor_type::Page); break;// relfromvPage
case 6: type = vertical_rel::Paragraph; set_anchor(anchor_type::Paragraph); break;// relfromvParagraph
case 7: type = vertical_rel::Baseline; break;// relfromvTopMargin ???
}
if (impl_->is_footer_header_ && ( from ==3 /*|| 5*/))
......@@ -1064,8 +1085,8 @@ void odf_drawing_context::set_vertical_rel(int from)
impl_->anchor_settings_.style_vertical_rel_ = vertical_rel(type);
if (!impl_->anchor_settings_.style_vertical_pos_)//default
impl_->anchor_settings_.style_vertical_pos_ = vertical_pos(vertical_pos::FromTop);
if (!impl_->anchor_settings_.style_vertical_pos_)
impl_->anchor_settings_.style_vertical_pos_ = vertical_pos(vertical_pos::FromTop);//default
}
void odf_drawing_context::set_vertical_pos(int align)
{
......@@ -1134,7 +1155,6 @@ void odf_drawing_context::set_overlap (bool val)
if (val)
{
impl_->anchor_settings_.style_wrap_ = style_wrap(style_wrap::RunThrough);//??
//impl_->anchor_settings_.run_through_ = run_through(run_through::Foreground);
}
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.h
View file @ 11d85322
......@@ -91,6 +91,7 @@ public:
bool is_exist_content();
//////////////////////////////////////////////////////////////////////////////////////
void set_path(std::wstring path_string);
void add_path_element(std::wstring command, std::wstring & elm);
void add_modifier(std::wstring modifier);
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp
View file @ 11d85322
......@@ -167,6 +167,9 @@ void OoxConverter::convert(SimpleTypes::Vml::CCssStyle *vml_style)
}
}
odf_context()->drawing_context()->set_drawings_rect(x, y, width_pt, height_pt);
if (width_pt && height_pt)
odf_context()->drawing_context()->set_viewBox(width_pt.get(), height_pt.get());
}
void OoxConverter::convert(OOX::Vml::CShape *vml_shape)
{
......@@ -176,6 +179,11 @@ void OoxConverter::convert(OOX::Vml::CShape *vml_shape)
{
}
odf_context()->drawing_context()->set_overlap(vml_shape->m_oAllowOverlap.GetValue());
if (vml_shape->m_oPath.IsInit())
{
odf_context()->drawing_context()->set_path(string2std_string(vml_shape->m_oPath->GetValue()));
}
for (long i=0 ; i < vml_shape->m_arrItems.GetSize();i++)
{
......@@ -270,11 +278,6 @@ void OoxConverter::convert(OOX::Vml::CPath *vml_path)
//SimpleTypes::CTrueFalse<SimpleTypes::booleanTrue> m_oStrokeOk;
//nullable<SimpleTypes::Vml::CVml_Polygon2D> m_oTextBoxRect;
//SimpleTypes::CTrueFalse<SimpleTypes::booleanFalse> m_oTextPathOk;
//nullable<SimpleTypes::Vml::CVmlPath> m_oV;
if (vml_path->m_oV.IsInit())
{
}
}
void OoxConverter::convert(OOX::Vml::CPolyLine *vml_polyline)
{
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @ 11d85322
......@@ -83,11 +83,11 @@ CString DocxConverter::find_link_by_id (CString sId, int type)
ref = pImage->filename().GetPath();
}
if (type==2 && oFile.IsInit() && OOX::FileTypes::Image == oFile->type())
if (type==2 && oFile.IsInit() && OOX::FileTypes::HyperLink == oFile->type())
{
OOX::Image* pImage = (OOX::Image*)oFile.operator->();
OOX::HyperLink* pHyperlink = (OOX::HyperLink*)oFile.operator->();
ref = pImage->filename().GetPath();
ref = pHyperlink->Uri().GetPath();
}
}
}
......@@ -102,11 +102,11 @@ CString DocxConverter::find_link_by_id (CString sId, int type)
ref = pImage->filename().GetPath();
}
if (type==2 && oFile.IsInit() && OOX::FileTypes::Image == oFile->type())
if (type==2 && oFile.IsInit() && OOX::FileTypes::HyperLink == oFile->type())
{
OOX::Image* pImage = (OOX::Image*)oFile.operator->();
OOX::HyperLink* pHyperlink = (OOX::HyperLink*)oFile.operator->();
ref = pImage->filename().GetPath();
ref = pHyperlink->Uri().GetPath();
}
}
}
......@@ -1584,7 +1584,14 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
}
else
{
odf_context()->drawing_context()->set_anchor(odf::anchor_type::AsChar);//default
odf_context()->drawing_context()->set_name(L"Name");
if (odt_context->table_context()->empty())
odf_context()->drawing_context()->set_anchor(odf::anchor_type::AsChar);//default
else
{
odf_context()->drawing_context()->set_anchor(odf::anchor_type::Paragraph);
odf_context()->drawing_context()->set_object_background(true);
}
if (oox_pic->m_oShape.IsInit())
OoxConverter::convert(oox_pic->m_oShape->m_oStyle.GetPointer());
......@@ -1612,6 +1619,8 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
else if (oox_pic->m_oShapeLine.IsInit())
{
odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeLine);
odf_context()->drawing_context()->set_line_width(1.);
OoxConverter::convert(oox_pic->m_oShape.GetPointer());
OoxConverter::convert(oox_pic->m_oShapeLine.GetPointer());
......@@ -1622,6 +1631,8 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
{
odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeLine);
odf_context()->drawing_context()->set_line_width(1.);
OoxConverter::convert(oox_pic->m_oShape.GetPointer());
OoxConverter::convert(oox_pic->m_oShapePolyLine.GetPointer());
......@@ -1670,6 +1681,13 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
else if (oox_pic->m_oShape->m_oConnectorType.GetValue() != SimpleTypes::connectortypeNone)
{
odf_context()->drawing_context()->start_shape(SimpleTypes::shapetypeStraightConnector1);
odf_context()->drawing_context()->set_line_width(1.);
bSet = true;
}
else if (oox_pic->m_oShape->m_oPath.IsInit())
{
odf_context()->drawing_context()->start_shape(1001);
odf_context()->drawing_context()->set_line_width(1.);
bSet = true;
}
}
......
ASCOfficeOdfFileW/version.h
View file @ 11d85322
......@@ -2,6 +2,6 @@
//1
//2
//0
//129
#define INTVER 1,2,0,129
#define STRVER "1,2,0,129\0"
//130
#define INTVER 1,2,0,130
#define STRVER "1,2,0,130\0"
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7