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/release/v7.3.0' into develop

Browse Source
This commit is contained in:
Elena Subbotina
2022-12-30 12:15:42 +03:00
parent 5c46c77beb be7a75c7c9
commit bd343c88d1
16 changed files with 934 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OOXML/DocxFormat/Diagram/DiagramData.cpp
View File

@ -950,6 +950,27 @@ namespace OOX
*pPt = oReader;
m_arrItems.push_back(pPt);
}
else if (L"mc:AlternateContent" == sName)
{
int nCurDepth = oReader.GetDepth();
while (oReader.ReadNextSiblingNode(nCurDepth))
{
std::wstring strName = oReader.GetName();
if (oReader.IsEmptyNode())
continue;
if (strName == L"mc:Choice")
{
fromXML(oReader);
break;
}
else if (strName == L"mc:Fallback")
{
fromXML(oReader);
}
}
}
}
}