Merge remote-tracking branch 'origin/hotfix/v5.0.7' into develop

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()

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"<root xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\">");
                 
                 std::wstring sEnd(L"</root>");
-                std::wstring sXml = sBegin + m_sXml.get() + sEnd;
+                std::wstring sXml = sBegin + xml_string + sEnd;
                                 
 				XmlUtils::CXmlLiteReader oSubReader;