Commit 288d8930 authored by konovalovsergey's avatar konovalovsergey

fix bug 33801

parent 4d519e8f
...@@ -60,11 +60,13 @@ namespace PPTX ...@@ -60,11 +60,13 @@ namespace PPTX
return *this; return *this;
} }
private:
public: virtual void fromXML2(XmlUtils::CXmlNode& node, bool bClear)
virtual void fromXML(XmlUtils::CXmlNode& node)
{ {
RunElems.clear(); if (bClear)
{
RunElems.clear();
}
XmlUtils::CXmlNodes oNodes; XmlUtils::CXmlNodes oNodes;
if (node.GetNodes(_T("*"), oNodes)) if (node.GetNodes(_T("*"), oNodes))
...@@ -94,19 +96,24 @@ namespace PPTX ...@@ -94,19 +96,24 @@ namespace PPTX
//todo better check (a14 can be math, slicer) //todo better check (a14 can be math, slicer)
if(oNodeChoice.GetAttributeIfExist(L"Requires", sRequires) && L"a14" == sRequires) if(oNodeChoice.GetAttributeIfExist(L"Requires", sRequires) && L"a14" == sRequires)
{ {
fromXML(oNodeChoice); fromXML2(oNodeChoice, false);
} }
else if (oNode.GetNode(_T("mc:Fallback"), oNodeFall)) else if (oNode.GetNode(_T("mc:Fallback"), oNodeFall))
{ {
fromXML(oNodeFall); fromXML2(oNodeFall, false);
} }
} }
} }
} }
} }
FillParentPointersForChilds(); FillParentPointersForChilds();
} }
public:
virtual void fromXML(XmlUtils::CXmlNode& node)
{
fromXML2(node, true);
}
virtual std::wstring toXML() const virtual std::wstring toXML() const
{ {
XmlUtils::CNodeValue oValue; XmlUtils::CNodeValue oValue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment