pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #66699

Browse Source
This commit is contained in:
Elena.Subbotina
2024-03-02 15:22:30 +03:00
parent e1ce2150dc
commit aad25c3da8
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OdfFile/Writer/Format/Shapes/oox_shapeCallouts.h
View File

@ -404,7 +404,8 @@ public:
view_box = L"0 0 21600 21600";
modifiers = L"6300 24300";
glue_points = L"?f40 ?f41";
glue_points_leaving_directions = L"180";
add(L"f0", L"$0 -10800");
add(L"f1", L"$1 -10800");
add(L"f2", L"if(?f18 ,$0 ,0)");

1
OdfFile/Writer/Format/draw_shapes.cpp
View File

@ -428,6 +428,7 @@ void draw_enhanced_geometry_attlist::serialize(CP_ATTR_NODE)
//CP_XML_ATTR_OPT(L"drawooo:enhanced-path", draw_enhanced_path_);
CP_XML_ATTR_OPT(L"draw:enhanced-path", draw_enhanced_path_);
CP_XML_ATTR_OPT(L"draw:glue-points", draw_glue_points_);
CP_XML_ATTR_OPT(L"draw:glue-point-leaving-directions", glue_points_leaving_directions_);
CP_XML_ATTR_OPT(L"draw:mirror-vertical", draw_mirror_vertical_);
CP_XML_ATTR_OPT(L"draw:mirror-horizontal", draw_mirror_horizontal_);

3
OdfFile/Writer/Format/draw_shapes.h
View File

@ -311,7 +311,8 @@ public:
_CP_OPT(std::wstring) draw_enhanced_path_;
_CP_OPT(std::wstring) draw_text_areas_;
_CP_OPT(std::wstring) draw_glue_points_;
_CP_OPT(std::wstring) glue_points_leaving_directions_;
_CP_OPT(std::wstring) draw_sub_view_size_;
_CP_OPT(odf_types::Bool) draw_mirror_vertical_;

12
OdfFile/Writer/Format/odf_drawing_context.cpp
View File

@ -1178,15 +1178,17 @@ void odf_drawing_context::end_shape()
enhanced->attlist_.draw_glue_points_ = shape_define->glue_points;
enhanced->attlist_.draw_sub_view_size_ = shape_define->sub_view_size;
enhanced->attlist_.glue_points_leaving_directions_ = shape_define->glue_points_leaving_directions;
enhanced->attlist_.draw_path_stretchpoint_x_ = shape_define->path_stretchpoint_x;
enhanced->attlist_.draw_path_stretchpoint_y_ = shape_define->path_stretchpoint_y;
if (!shape_define->modifiers.empty())
{
enhanced->attlist_.draw_modifiers_ = shape_define->modifiers;
}
else if (impl_->current_drawing_state_.oox_shape_ && !impl_->current_drawing_state_.oox_shape_->modifiers.empty())
//if (!shape_define->modifiers.empty())
//{
// enhanced->attlist_.draw_modifiers_ = shape_define->modifiers;
//}
if (impl_->current_drawing_state_.oox_shape_ && !impl_->current_drawing_state_.oox_shape_->modifiers.empty())
{
enhanced->attlist_.draw_modifiers_ = impl_->current_drawing_state_.oox_shape_->modifiers;
}

5
OdfFile/Writer/Format/oox_shape_defines.h
View File

@ -82,9 +82,10 @@ namespace cpdoccore
_CP_OPT(std::wstring) view_box;
_CP_OPT(std::wstring) sub_view_size;
_CP_OPT(std::wstring) glue_points;
_CP_OPT(std::wstring) glue_points_leaving_directions;
std::wstring path_stretchpoint_x;
std::wstring path_stretchpoint_y;
_CP_OPT(std::wstring) path_stretchpoint_x;
_CP_OPT(std::wstring) path_stretchpoint_y;
std::wstring odf_type_name;
};