diff --git a/Common/3dParty/cef/download.ps1 b/Common/3dParty/cef/download.ps1 index 0bbcfd69ef..92ccbb903d 100644 --- a/Common/3dParty/cef/download.ps1 +++ b/Common/3dParty/cef/download.ps1 @@ -10,7 +10,7 @@ function Download-File $downloadRequired = $true if (Test-Path $file) { - $localModified = (Get-Item $file).LastWriteTime + $localModified = (Get-Item $file).CreationTime $webRequest = [System.Net.HttpWebRequest]::Create($url) $webRequest.Method = "HEAD" $webResponse = $webRequest.GetResponse() diff --git a/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h b/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h index f93b138cbe..6e7a39af70 100644 --- a/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h +++ b/Common/DocxFormat/Source/DocxFormat/Logic/Pict.h @@ -142,7 +142,13 @@ namespace OOX virtual void fromXML(XmlUtils::CXmlNode &oNode) { - // TO DO: Реализовать CPicture::fromXML(XmlUtils::CXmlNode &oNode) + if ( oNode.IsValid() == false) + return; + + m_sXml.Init(); + *m_sXml = oNode.GetXml(); //для pptx dll + + fromStringXML(m_sXml.get()); } virtual void fromXML(XmlUtils::CXmlLiteReader& oReader) @@ -152,11 +158,15 @@ namespace OOX m_sXml.Init(); *m_sXml = oReader.GetOuterXml(); //для pptx dll - + + fromStringXML(m_sXml.get()); + } + void fromStringXML(const std::wstring & xml_string) + { std::wstring sBegin(L""); std::wstring sEnd(L""); - std::wstring sXml = sBegin + m_sXml.get() + sEnd; + std::wstring sXml = sBegin + xml_string + sEnd; XmlUtils::CXmlLiteReader oSubReader;