(2.0.1.324): ASCOfficeDocxFile2

пересобран в MSVC2013, graphics.lib собрана в QT с компилятором MSVC2013.
вошли изменения:Revision: 62557 добавлен jBig2 в graphics, убраны конфликты сборок под linux, убран MetaFile из HtmlRenderer;Revision: 62576 MetaFile из HtmlRenderer в raster, добавление Jp2 файлов в win32 проект raster;Revision: 62642 ole обьекты копируются при открытии и сохранении в неизменном виде.;Revision: 62534 исправлено падение записи чисел в формулах


git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62691 954022d7-b5bf-4e40-9824-e11837661b57

ASCHTMLRenderer/ASCHTMLRendererLib.vcxproj.filters

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Writer">
+      <UniqueIdentifier>{45e0dc44-fee5-48be-a1ed-69991ba2f39f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ASCSVGWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CASCImage.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CASCSVGRenderer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CMetafile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ASCSVGWriter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CASCImage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CASCSVGRenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CMetafile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\Common.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\Const.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IBaseMatrixUpdater.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\TextItem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\StringWriter.h">
+      <Filter>Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\SVGWriter.h">
+      <Filter>Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\VectorGraphicsWriter2.h">
+      <Filter>Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="Writer\VMLWriter.h">
+      <Filter>Writer</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcxproj.filters

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="res">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="_">
+      <UniqueIdentifier>{3710d9f5-676c-4632-a22d-632057708e84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DocWrapper">
+      <UniqueIdentifier>{da428055-8b24-49ac-a8fd-fb7567370761}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="XLSX">
+      <UniqueIdentifier>{2b0ee265-23a7-4758-b2e7-9f335c2932c6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="XLSX\Common">
+      <UniqueIdentifier>{d3849c02-1f95-40b4-9885-3850ac887162}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="XLSX\Reader">
+      <UniqueIdentifier>{6e356698-1762-48ec-aabe-e67cd986841e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="XLSX\Writer">
+      <UniqueIdentifier>{a6d705d7-de56-4085-ad90-9a64fb2a6377}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DOCX">
+      <UniqueIdentifier>{819e4322-0635-4959-bee0-bd7258b92b82}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DOCX\Reader">
+      <UniqueIdentifier>{710f68a2-18f0-40c6-8e32-5474b8301127}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DOCX\Reader\OOXWriter">
+      <UniqueIdentifier>{fb8f2ef8-d3e2-4bae-a746-4dd375a45521}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DOCX\Common">
+      <UniqueIdentifier>{845568f5-8012-46bf-a6d7-63610040f153}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DOCX\Writer">
+      <UniqueIdentifier>{276e338e-bf55-47f1-8fd6-d73552eed0d4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ASCOfficeDocxFile2.rc">
+      <Filter>res</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ASCOfficeDocxFile2.rgs">
+      <Filter>res</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ASCOfficeDocxFile2.cpp">
+      <Filter>_</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>_</Filter>
+    </ClCompile>
+    <ClCompile Include="DocWrapper\FontProcessor.cpp">
+      <Filter>DocWrapper</Filter>
+    </ClCompile>
+    <ClCompile Include="DocWrapper\XlsxSerializer.cpp">
+      <Filter>XLSX</Filter>
+    </ClCompile>
+    <ClCompile Include="..\XlsxSerializerCom\Common\Common.cpp">
+      <Filter>XLSX\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\XlsxSerializerCom\Reader\CSVReader.cpp">
+      <Filter>XLSX\Reader</Filter>
+    </ClCompile>
+    <ClCompile Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp">
+      <Filter>XLSX\Writer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\XlsxSerializerCom\Reader\CommonWriter.cpp">
+      <Filter>XLSX\Writer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\XlsxSerializerCom\Writer\CSVWriter.cpp">
+      <Filter>XLSX\Writer</Filter>
+    </ClCompile>
+    <ClCompile Include="DocWrapper\DocxSerializer.cpp">
+      <Filter>DOCX</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Resource.h">
+      <Filter>_</Filter>
+    </ClInclude>
+    <ClInclude Include="version.h">
+      <Filter>_</Filter>
+    </ClInclude>
+    <ClInclude Include="DocWrapper\FontProcessor.h">
+      <Filter>DocWrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="DocWrapper\XlsxSerializer.h">
+      <Filter>XLSX</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Common\BinReaderWriterDefines.h">
+      <Filter>XLSX\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Common\Common.h">
+      <Filter>XLSX\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryCommonReader.h">
+      <Filter>XLSX\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryReader.h">
+      <Filter>XLSX\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Reader\CSVReader.h">
+      <Filter>XLSX\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Reader\BinaryWriter.h">
+      <Filter>XLSX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.h">
+      <Filter>XLSX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Reader\CommonWriter.h">
+      <Filter>XLSX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\XlsxSerializerCom\Writer\CSVWriter.h">
+      <Filter>XLSX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="DocWrapper\DocxSerializer.h">
+      <Filter>DOCX</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\ReaderClasses.h">
+      <Filter>DOCX\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\Readers.h">
+      <Filter>DOCX\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\ChartWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\CommentsWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\ContentTypesWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\DocumentRelsWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\DocumentWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\FileWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\fontTableWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\HeaderFooterWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\MediaWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\NumberingWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\SettingWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\StylesWriter.h">
+      <Filter>DOCX\Reader\OOXWriter</Filter>
+    </ClInclude>
+    <ClInclude Include="BinReader\FileDownloader.h">
+      <Filter>DOCX\Common</Filter>
+    </ClInclude>
+    <ClInclude Include="BinWriter\BinEquationWriter.h">
+      <Filter>DOCX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="BinWriter\BinReaderWriterDefines.h">
+      <Filter>DOCX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="BinWriter\BinWriters.h">
+      <Filter>DOCX\Writer</Filter>
+    </ClInclude>
+    <ClInclude Include="DocxFile2.h" />
+    <ClInclude Include="PptxFile.h" />
+    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="XlsxFile2.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2_2013.sln

+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocxFile2", "ASCOfficeDocxFile2.vcxproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcxproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcxproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.Build.0 = Debug|Win32
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.ActiveCfg = Debug|x64
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.Build.0 = Debug|x64
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.ActiveCfg = Release|Win32
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.Build.0 = Release|Win32
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.ActiveCfg = Release|x64
+		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.Build.0 = Release|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.Build.0 = Debug|x64
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64
+		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.Build.0 = Debug|Win32
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|x64.ActiveCfg = Debug|Win32
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.ActiveCfg = Release|Win32
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.Build.0 = Release|Win32
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
+EndGlobal

ASCOfficeDocxFile2/dlldata.c

@@ -20,13 +20,11 @@ extern "C"   {
 #endif
 
 EXTERN_PROXY_FILE( _ASCOfficeDocxFile2 )
-EXTERN_PROXY_FILE( _AVSOfficeDocxFile2 )
 
 
 PROXYFILE_LIST_START
 /* Start of list */
   REFERENCE_PROXY_FILE( _ASCOfficeDocxFile2 ),
-  REFERENCE_PROXY_FILE( _AVSOfficeDocxFile2 ),
 /* End of list */
 PROXYFILE_LIST_END
 

ASCOfficeDocxFile2/stdafx.h

@@ -11,11 +11,11 @@
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
 #ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#define WINVER 0x0500		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
 #endif
 
 #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 2000 or later.
+#define _WIN32_WINNT 0x0500	// Change this to the appropriate value to target Windows 2000 or later.
 #endif						
 
 #ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//323
-#define INTVER 2,0,1,323
-#define STRVER "2,0,1,323\0"
+//324
+#define INTVER 2,0,1,324
+#define STRVER "2,0,1,324\0"

ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp

 #include "ZipUtilsCP.h"
 #include <memory>
+#include <algorithm>
 #include "CSLocker.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/Path.h"

ASCOfficeUtils/ASCOfficeUtilsLib/Win/ASCOfficeUtilsLib.vcxproj.filters

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="minizip">
+      <UniqueIdentifier>{457faa9f-96dc-4462-98bb-7d1b4eb9b972}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="zlib">
+      <UniqueIdentifier>{461e6e72-344c-4c0d-89ce-dd6d71b2e305}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\OfficeUtils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ASCOfficeUtils\ZipUtilsCP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\ioapi.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\iowin32.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\miniunz.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\minizip.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\mztools.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\unzip.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\zip.c">
+      <Filter>minizip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\adler32.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\compress.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\crc32.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\deflate.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\example.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\gzio.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\infback.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\inffast.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\inflate.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\inftrees.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\minigzip.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\trees.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\uncompr.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ZLIB\zlib-1.2.3\zutil.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ASCOfficeUtils\ASCOfficeCriticalSection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ASCOfficeUtils\CSLocker.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\OfficeUtils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\OfficeUtilsCommon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ASCOfficeUtils\ZipUtilsCP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\crypt.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\ioapi.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\iowin32.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\mztools.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\unzip.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\contrib\minizip\zip.h">
+      <Filter>minizip</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\crc32.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\deflate.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\inffast.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\inffixed.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\inflate.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\inftrees.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\trees.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\zconf.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\zconf.in.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\zlib.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ZLIB\zlib-1.2.3\zutil.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Common/DocxFormat/Source/XML/libxml2/win_build/libxml2.vcxproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{21663823-DE45-479B-91D0-B4FEF4916EF0}</ProjectGuid>
+    <RootNamespace>libxml2</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <UseOfAtl>false</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>false</UseOfAtl>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\XML\buf.c" />
+    <ClCompile Include="..\XML\c14n.c" />
+    <ClCompile Include="..\XML\catalog.c" />
+    <ClCompile Include="..\XML\chvalid.c" />
+    <ClCompile Include="..\XML\debugXML.c" />
+    <ClCompile Include="..\XML\dict.c" />
+    <ClCompile Include="..\XML\DOCBparser.c" />
+    <ClCompile Include="..\XML\encoding.c" />
+    <ClCompile Include="..\XML\entities.c" />
+    <ClCompile Include="..\XML\error.c" />
+    <ClCompile Include="..\XML\globals.c" />
+    <ClCompile Include="..\XML\hash.c" />
+    <ClCompile Include="..\XML\HTMLparser.c" />
+    <ClCompile Include="..\XML\HTMLtree.c" />
+    <ClCompile Include="..\XML\legacy.c" />
+    <ClCompile Include="..\XML\list.c" />
+    <ClCompile Include="..\XML\nanoftp.c" />
+    <ClCompile Include="..\XML\nanohttp.c" />
+    <ClCompile Include="..\XML\parser.c" />
+    <ClCompile Include="..\XML\parserInternals.c" />
+    <ClCompile Include="..\XML\pattern.c" />
+    <ClCompile Include="..\XML\relaxng.c" />
+    <ClCompile Include="..\XML\SAX.c" />
+    <ClCompile Include="..\XML\SAX2.c" />
+    <ClCompile Include="..\XML\schematron.c" />
+    <ClCompile Include="..\XML\threads.c" />
+    <ClCompile Include="..\XML\tree.c" />
+    <ClCompile Include="..\XML\uri.c" />
+    <ClCompile Include="..\XML\valid.c" />
+    <ClCompile Include="..\XML\xinclude.c" />
+    <ClCompile Include="..\XML\xlink.c" />
+    <ClCompile Include="..\XML\xmlcatalog.c" />
+    <ClCompile Include="..\XML\xmlIO.c" />
+    <ClCompile Include="..\XML\xmlmemory.c" />
+    <ClCompile Include="..\XML\xmlmodule.c" />
+    <ClCompile Include="..\XML\xmlreader.c" />
+    <ClCompile Include="..\XML\xmlregexp.c" />
+    <ClCompile Include="..\XML\xmlsave.c" />
+    <ClCompile Include="..\XML\xmlschemas.c" />
+    <ClCompile Include="..\XML\xmlschemastypes.c" />
+    <ClCompile Include="..\XML\xmlstring.c" />
+    <ClCompile Include="..\XML\xmlunicode.c" />
+    <ClCompile Include="..\XML\xmlwriter.c" />
+    <ClCompile Include="..\XML\xpath.c" />
+    <ClCompile Include="..\XML\xpointer.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\XML\elfgcchack.h" />
+    <ClInclude Include="..\XML\libxml.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file