Merge branch 'hotfix/v4.3.5'

Common/3dParty/cef/fetch.bat

 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
+)
+
+if defined TARGET (
+	SET PLATFORM=%TARGET%
 )
 
-mkdir "%SCRIPTPATH%%PLATFORM%%ARCH%"
-cd "%SCRIPTPATH%%PLATFORM%%ARCH%"
+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

@@ -150,7 +150,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 CTheme( oFileName ));
+		{
+			if(NSFile::CFileBinary::Exists(oFileName.GetPath()))
+			{
+				return smart_ptr<OOX::File>(new CTheme( oFileName ));
+			}
+			else
+			{
+				return smart_ptr<OOX::File>( new UnknowTypeFile() );
+			}
+		}
 		else if ( pRelation->Type() == FileTypes::ThemeOverride)
 			return smart_ptr<OOX::File>(new CThemeOverride( oFileName ));
 		else if ( pRelation->Type() == FileTypes::Setting)

Common/DocxFormat/Source/XlsxFormat/FileFactory_Spreadsheet.cpp

@@ -126,7 +126,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 CTheme( oFileName ));
+			{
+				if(NSFile::CFileBinary::Exists(oFileName.GetPath()))
+				{
+					return smart_ptr<OOX::File>(new CTheme( oFileName ));
+				}
+				else
+				{
+					return smart_ptr<OOX::File>( new UnknowTypeFile() );
+				}
+			}
 			else if ( pRelation->Type() == OOX::FileTypes::ThemeOverride )
 				return smart_ptr<OOX::File>(new CThemeOverride( oFileName ));
 			else if ( pRelation->Type() == FileTypes::Drawings )