pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix/pre9.0.1' into develop

Browse Source
This commit is contained in:
Elena Subbotina
2025-06-19 13:44:30 +03:00
parent 03463ee0e4 2680fd7073
commit b8053ae388
228 changed files with 9318 additions and 3001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OdfFile/Writer/Converter/ConvertDrawing.cpp
View File

@ -3005,6 +3005,7 @@ void OoxConverter::convert(PPTX::Logic::StyleRef *style_ref, int type)
}
else if (type == 3)
{
index -= 1;
if (index >= 0 && index < (int)theme->themeElements.fmtScheme.effectStyleLst.size())
{
convert(&theme->themeElements.fmtScheme.effectStyleLst[index], nARGB);

4
OdfFile/Writer/Format/style_graphic_properties.cpp
View File

@ -56,7 +56,9 @@ void graphic_format_properties::apply_from(const graphic_format_properties & Oth
_CP_APPLY_PROP2(draw_stroke_dash_);
_CP_APPLY_PROP2(draw_marker_start_);
_CP_APPLY_PROP2(draw_marker_end_);
_CP_APPLY_PROP2(draw_textarea_horizontal_align_);
_CP_APPLY_PROP2(draw_marker_start_width_);
_CP_APPLY_PROP2(draw_marker_end_width_);
_CP_APPLY_PROP2(draw_textarea_horizontal_align_);
_CP_APPLY_PROP2(draw_textarea_vertical_align_);
_CP_APPLY_PROP2(draw_auto_grow_height_);
_CP_APPLY_PROP2(draw_auto_grow_width_);