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

Merge remote-tracking branch 'origin/fix/bug65362' into release/v8.0.0

Browse Source
This commit is contained in:
Elena.Subbotina
2023-12-15 17:15:56 +03:00
parent 423411b679 607d32e32b
commit fce70b0c0c
5 changed files with 360 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OdfFile/Writer/Converter/PptxConverter.cpp
View File

@ -791,7 +791,7 @@ void PptxConverter::convert(PPTX::Logic::AnimEffect* oox_anim_effect)
std::wstring filter = *oox_anim_effect->filter;
std::wstring subtype = L"";
smil_transition_type odfType;
_CP_OPT(smil_transition_type) odfType = boost::none;
std::wstring odfSubtype = L"";
bool odfReversed = false;
@ -912,13 +912,19 @@ void PptxConverter::convert(PPTX::Logic::AnimEffect* oox_anim_effect)
else if (subtype == L"down") { odfReversed = true; odfSubtype = L"fromBottom"; }
else if (subtype == L"up") { odfReversed = false; odfSubtype = L"fromTop"; }
}
else if (filter == L"image")
{
odfType = boost::none;
}
else
{
odfType = smil_transition_type::fade;
odfReversed = false;
}
odp_context->current_slide().set_anim_transition_filter_type(odfType);
if(odfType)
odp_context->current_slide().set_anim_transition_filter_type(odfType.value());
if(!odfSubtype.empty())
odp_context->current_slide().set_anim_transition_filter_subtype(odfSubtype);
if(odfReversed)