.

Hotfix/v4.3.5

Common/3dParty/cef/fetch.bat

@@ -1,19 +1,21 @@
 SET SCRIPTPATH=%~dp0
 CD /D %~dp0
-SET PLATFORM=win
-SET ARCH=_32
-
+SET PLATFORM=win_32
 if defined ProgramFiles(x86) (
-	SET ARCH=_64
+	SET PLATFORM=win_64
 )
 
-mkdir "%SCRIPTPATH%%PLATFORM%%ARCH%"
-cd "%SCRIPTPATH%%PLATFORM%%ARCH%"
+if defined TARGET (
+	SET PLATFORM=%TARGET%
+)
+
+mkdir "%SCRIPTPATH%%PLATFORM%"
+cd "%SCRIPTPATH%%PLATFORM%"
 
 if exist "cef_binary.7z" (
     echo "cef_binary.7z already downloaded"
 ) else (
-    Powershell.exe Invoke-WebRequest -OutFile cef_binary.7z http://d2ettrnqo7v976.cloudfront.net/cef/2454/%PLATFORM%%ARCH%/cef_binary.7z
+    Powershell.exe Invoke-WebRequest -OutFile cef_binary.7z http://d2ettrnqo7v976.cloudfront.net/cef/2454/%PLATFORM%/cef_binary.7z
 )
 
 SET UNSIP_PROGRAMM="%ProgramFiles%\7-Zip\7z.exe"

Common/3dParty/icu/fetch.bat

@@ -6,6 +6,10 @@ if defined ProgramFiles(x86) (
 	SET platform=win_64
 )
 
+if defined TARGET (
+	SET platform=%TARGET%
+)
+
 if not exist "%platform%" (
 	md "%platform%"
 )

Common/DocxFormat/Source/DocxFormat/FileFactory.cpp

@@ -158,7 +158,16 @@ namespace OOX
 		else if ( pRelation->Type() == FileTypes::Document)
 			return smart_ptr<OOX::File>(new CDocument( oRootPath, oFileName ));
 		else if ( pRelation->Type() == FileTypes::Theme)
-			return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
+		{
+			if(NSFile::CFileBinary::Exists(oFileName.GetPath()))
+			{
+				return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
+			}
+			else
+			{
+				return smart_ptr<OOX::File>( new UnknowTypeFile() );
+			}
+		}
 		else if ( pRelation->Type() == FileTypes::ThemeOverride)
 			return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
 		else if ( pRelation->Type() == FileTypes::Setting)

Common/DocxFormat/Source/XlsxFormat/ExternalLinks/ExternalLinks.h

@@ -77,7 +77,7 @@ namespace OOX
 				for (size_t i = 0; i < m_arrItems.size(); ++i)
 				{
 					writer.WriteString(L"<sheetName ");
-					writer.WriteString(m_arrItems[i]->ToString());
+					writer.WriteEncodeXmlString(m_arrItems[i]->ToString());
 					writer.WriteString(L"/>");
 				}
 				writer.WriteString(L"</sheetNames>");
@@ -121,8 +121,8 @@ namespace OOX
 			virtual void toXML(NSStringUtils::CStringBuilder& writer) const
 			{
 				writer.WriteString(L"<definedName");
-				WritingStringNullableAttrString(L"name", m_oName, m_oName.get());
-				WritingStringNullableAttrString(L"refersTo", m_oRefersTo, m_oRefersTo.get());
+				WritingStringNullableAttrEncodeXmlString(L"name", m_oName, m_oName.get());
+				WritingStringNullableAttrEncodeXmlString(L"refersTo", m_oRefersTo, m_oRefersTo.get());
 				WritingStringNullableAttrInt(L"sheetId", m_oSheetId, m_oSheetId->GetValue());
 				writer.WriteString(L"/>");
 			}

Common/DocxFormat/Source/XlsxFormat/FileFactory_Spreadsheet.cpp

@@ -128,7 +128,16 @@ namespace OOX
 			else if ( pRelation->Type() == FileTypes::Worksheet )
 				return smart_ptr<OOX::File>(new CWorksheet( oRootPath, oFileName ));
 			else if ( pRelation->Type() == OOX::FileTypes::Theme )
-				return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
+			{
+				if(NSFile::CFileBinary::Exists(oFileName.GetPath()))
+				{
+					return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
+				}
+				else
+				{
+					return smart_ptr<OOX::File>( new UnknowTypeFile() );
+				}
+			}
 			else if ( pRelation->Type() == OOX::FileTypes::ThemeOverride )
 				return smart_ptr<OOX::File>(new PPTX::Theme( oFileName ));
 			else if ( pRelation->Type() == FileTypes::Drawings )

DesktopEditor/xmlsec/test/openssl_linux/main.cpp

@@ -5,6 +5,7 @@
 #include <openssl/pkcs12.h>
 
 #include <openssl/sha.h>
+#include <openssl/ssl.h>
 
 #include "../../../common/File.h"
 
@@ -43,7 +44,7 @@ static time_t ASN1_GetTimeT(ASN1_TIME* time)
     return mktime(&t);
 }
 
-#if 1
+#if 0
 int main()
 {
     std::wstring sFolderW = NSFile::GetProcessDirectory();
@@ -140,7 +141,7 @@ int main()
 }
 #endif
 
-#if 0
+#if 1
 int main(int argc, char **argv)
 {
     std::wstring sFolderW = NSFile::GetProcessDirectory();
@@ -157,6 +158,7 @@ int main(int argc, char **argv)
     STACK_OF(X509) *ca = NULL;
     PKCS12 *p12;
 
+    SSL_library_init();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
 

DesktopEditor/xmlsec/test/openssl_linux/test.pro

@@ -18,7 +18,7 @@ DEFINES += XMLSEC_OPENSSL_110
 
 INCLUDEPATH += $$PWD/../../openssl/include
 
-LIBS += -L$$PWD/../../openssl -lcrypto -lssl
+LIBS += -L$$PWD/../../openssl -lssl -lcrypto
 LIBS += -ldl
 
 SOURCES += main.cpp