Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -339,9 +339,9 @@ public:
 				if(ThemeColor.bColor)
                     sShd += L" w:themeFill=\"" + ThemeColor.ToStringColor() + L"\"";
                 if(ThemeColor.bTint)
-                    sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringColor() + L"\"";
+                    sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringTint() + L"\"";
 				if(ThemeColor.bShade)
-                    sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringColor() + L"\"";
+                    sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringShade() + L"\"";
 			}
             sShd += L"/>";
 		}

ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp

@@ -165,15 +165,8 @@ namespace PPTX
 
 				smart_ptr<OOX::File> file = smart_ptr<OOX::File>(new OOX::HyperLink(pRelation->Target()));
 
-                bool res = Event->Progress(0, percent + m_lPercent);
-
                 Add(pRelation->rId(), file);
 
-                if (res || m_bCancelled)
-                {
-                    m_bCancelled = true;
-                    break;
-                }
 			}
 			else
 			{
@@ -194,7 +187,7 @@ namespace PPTX
 					Add(pRelation->rId(), file);
 
 					smart_ptr<FileContainer> pContainer = file.smart_dynamic_cast<FileContainer>();
-                    bool res = Event->Progress(0, percent + m_lPercent);
+                    Event->Progress(0, percent + m_lPercent);
 
                     if (pContainer.IsInit())
 					{

Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp

@@ -173,9 +173,8 @@ namespace OOX
 	bool CPath::FileInDirectoryCorrect()
 	{
 		std::wstring fileDirectory = GetDirectory(false);
-		std::wstring lowerFileName = m_strFilename;
 
-		XmlUtils::GetLower(lowerFileName);
+        std::wstring lowerFileName = XmlUtils::GetLower(m_strFilename);
 
 		CArray<std::wstring> trueArray;
 
@@ -183,8 +182,7 @@ namespace OOX
 
 		for (int i = 0; i < trueArray.GetCount(); i++)
 		{
-			std::wstring lowerTest = trueArray[i];
-			XmlUtils::GetLower(lowerTest);
+            std::wstring lowerTest = XmlUtils::GetLower(trueArray[i]);
 
 			if (lowerTest == lowerFileName)
 			{

DesktopEditor/xml/src/xmllight_private.h

@@ -82,7 +82,8 @@ namespace XmlUtils
             Clear();
 
             NSFile::CFileBinary oFile;
-            oFile.OpenFile(sFilePath);
+            if (oFile.OpenFile(sFilePath) == false) return false;
+
             m_lStreamLen = (LONG)oFile.GetFileSize();
             m_pStream = new BYTE[m_lStreamLen];
             DWORD dwRead = 0;

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.3.435
+VERSION = 2.0.3.436
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t