Compare commits

..

1 Commits

Author SHA1 Message Date
288d89301a fix bug 33801 2017-01-31 17:16:28 +03:00

View File

@ -60,11 +60,13 @@ namespace PPTX
return *this;
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
private:
virtual void fromXML2(XmlUtils::CXmlNode& node, bool bClear)
{
RunElems.clear();
if (bClear)
{
RunElems.clear();
}
XmlUtils::CXmlNodes oNodes;
if (node.GetNodes(_T("*"), oNodes))
@ -94,19 +96,24 @@ namespace PPTX
//todo better check (a14 can be math, slicer)
if(oNodeChoice.GetAttributeIfExist(L"Requires", sRequires) && L"a14" == sRequires)
{
fromXML(oNodeChoice);
fromXML2(oNodeChoice, false);
}
else if (oNode.GetNode(_T("mc:Fallback"), oNodeFall))
{
fromXML(oNodeFall);
fromXML2(oNodeFall, false);
}
}
}
}
}
FillParentPointersForChilds();
}
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
fromXML2(node, true);
}
virtual std::wstring toXML() const
{
XmlUtils::CNodeValue oValue;