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

cutting animation without object

Browse Source
This commit is contained in:
Ivan Morozov
2021-05-12 16:40:09 +03:00
parent 92e88aaf75
commit b4cadae376
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Animation.cpp
View File

@ -57,13 +57,14 @@ void Animation::Convert(PPTX::Logic::Timing &oTiming)
oTiming.bldLst = new PPTX::Logic::BldLst();
FillBldLst(m_pPPT10->m_pBuildListContainer, *(oTiming.bldLst));
m_pBldLst = oTiming.bldLst.GetPointer();
if (m_pPPT10->m_haveExtTime)
{
oTiming.tnLst = new PPTX::Logic::TnLst();
FillTnLst(m_pPPT10->m_pExtTimeNodeContainer, *(oTiming.tnLst));
}
}
if (m_pPPT10->m_haveExtTime)
{
oTiming.tnLst = new PPTX::Logic::TnLst();
FillTnLst(m_pPPT10->m_pExtTimeNodeContainer, *(oTiming.tnLst));
}
} else if (!m_arrOldAnim.empty())
{
InitTimingTags(oTiming);

7
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp
View File

@ -1314,10 +1314,10 @@ void PPT_FORMAT::CPPTXWriter::WriteTransition(CStringWriter& oWriter, CSlideShow
switch (transition.m_nSpeed)
{
// TODO check this moment. Always write fast
case 0x00: oWriter.WriteString(L" spd=\"fast\""); break;
case 0x00: oWriter.WriteString(L" spd=\"slow\""); break;
case 0x01: oWriter.WriteString(L" spd=\"med\""); break;
case 0x02:
default: oWriter.WriteString(L" spd=\"slow\""); break;
default: oWriter.WriteString(L" spd=\"fast\""); break;
}
if (oSSInfo.m_bOnlyClick == false)
{
@ -1479,7 +1479,8 @@ void PPT_FORMAT::CPPTXWriter::WriteTiming(CStringWriter& oWriter, CRelsGenerator
}
animation.Convert(oTiming);
oWriter.WriteString(oTiming.toXML());
if (oTiming.tnLst.is_init())
oWriter.WriteString(oTiming.toXML());
//oWriter.WriteString(std::wstring(L"<p:timing><p:tnLst><p:par><p:cTn id=\"1\" dur=\"indefinite\" restart=\"never\" nodeType=\"tmRoot\" /></p:par></p:tnLst></p:timing>"));
}