test projects fix

ASCOfficeOdfFileW/ASCOfficeOdfFileWTest/ASCOfficeOdfFileWTest.vcproj

@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MSC_VER=1800"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

ASCOfficeOdfFileW/win32/ASCOfficeOdfFileW.sln

@@ -11,18 +11,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatWriterLib", "..\so
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "..\source\win32\Oox2OdfConverter.vcproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}"
 	ProjectSection(ProjectDependencies) = postProject
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
+		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
 		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
-		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileWTest", "..\ASCOfficeOdfFileWTest\ASCOfficeOdfFileWTest.vcproj", "{FBA8446A-150F-4A10-B4DA-1022048D6473}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 		{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"

ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj

@@ -66,11 +66,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\include;D:\WORK\boost\1_60_0;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\XML\include;C:\__Work\core\Common\3dParty\curl\include;C:\__Work\core\DesktopEditor\freetype-2.5.2\include;C:\__Work\core\UnicodeConverter\icubuilds\win_32\include;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\win_build;$(IncludePath)</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\lib;D:\WORK\boost\1_60_0\stage\lib\i386;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
@@ -149,23 +151,6 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\Elements.cpp" />
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp" />
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.cpp" />
-    <ClCompile Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="..\..\Common\DocxFormat\Source\XML\stringcommon.cpp" />
     <ClCompile Include="..\ASCOfficeDrawingConverter.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -175,31 +160,38 @@
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <ClCompile Include="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\DocxFormat\Source\XML\stringcommon.cpp" />
     <ClCompile Include="..\Editor\BinaryFileReaderWriter.cpp" />
+    <ClCompile Include="..\Editor\Drawing\Elements.cpp" />
     <ClCompile Include="..\Editor\FontPicker.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
     </ClCompile>
-    <ClCompile Include="..\File.cpp" />
-    <ClCompile Include="..\PPTXFormat\DocxFormat\IFileContainer.cpp">
+    <ClCompile Include="..\Editor\Drawing\Layout.cpp" />
+    <ClCompile Include="..\Editor\Drawing\TextAttributesEx.cpp" />
+    <ClCompile Include="..\PPTXFormat\FileContainer.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\FileContainer.cpp">
+    <ClCompile Include="..\PPTXFormat\FileFactory.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\FileFactory.cpp">
+    <ClCompile Include="..\PPTXFormat\Folder.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Folder.cpp">
+    <ClCompile Include="..\PPTXFormat\DocxFormat\IFileContainer.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
@@ -214,194 +206,169 @@
     <ClCompile Include="..\PPTXFormat\Logic\CNvGrpSpPr.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Colors\SchemeClr.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\ContentPart.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\EffectDag.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\EffectLst.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\EffectProperties.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\EffectStyle.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\Geometry.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="..\PPTXFormat\Logic\GrpSpPr.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\NvGraphicFramePr.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\NvGrpSpPr.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\SpTree.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+    </ClCompile>
+    <ClCompile Include="..\PPTXFormat\Logic\SpTreeElem.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\ContentPart.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\Controls.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\CxnSp.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\UniColor.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\EffectDag.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\EffectLst.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\EffectProperties.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\EffectStyle.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\Fills\Blip.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\UniEffect.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Geometry.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\GraphicFrame.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Fills\Blip.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\GrpSpPr.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\Hyperlink.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\NvGraphicFramePr.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\NvGrpSpPr.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\Pic.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Colors\SchemeClr.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Shape.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Runs\MathParaWrapper.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\Transitions\TransitionBase.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\ShapeProperties.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Timing\BuildNodeBase.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\ShapeTextProperties.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Timing\TimeNodeBase.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\SmartArt.cpp" />
-    <ClCompile Include="..\PPTXFormat\Logic\SpPr.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\GraphicFrame.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\SpTree.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\SpTreeElem.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\SmartArt.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\CxnSp.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Table\TableCell.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Pic.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Timing\BuildNodeBase.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\TxBody.cpp">
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
+    </ClCompile>
+    <ClCompile Include="..\PPTXFormat\Logic\Shape.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Timing\TimeNodeBase.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\ShapeProperties.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\Transitions\TransitionBase.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\ShapeTextProperties.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\TxBody.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
-    </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\UniColor.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\SpPr.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="..\PPTXFormat\Logic\UniEffect.cpp">
+    <ClCompile Include="..\PPTXFormat\Logic\Table\TableCell.cpp">
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">./StdAfx.h</PrecompiledHeaderFile>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">./StdAfx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">./StdAfx.h</PrecompiledHeaderFile>
     </ClCompile>
+    <ClCompile Include="..\PPTXFormat\Logic\Controls.cpp" />
+    <ClCompile Include="..\PPTXFormat\Logic\Hyperlink.cpp" />
+    <ClCompile Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\File.cpp" />
+    <ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\FileTypes.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\Unit.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\UnknowTypeFile.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\File.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\FileSystem\FileSystem.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h" />
-    <ClInclude Include="..\..\Common\DocxFormat\Source\XML\stringcommon.h" />
     <ClInclude Include="..\ASCOfficeDrawingConverter.h" />
     <ClInclude Include="..\ASCOfficePPTXFile.h" />
-    <ClInclude Include="..\Directory.h" />
-    <ClInclude Include="..\Editor\BinaryFileReaderWriter.h" />
-    <ClInclude Include="..\Editor\BinReaderWriterDefines.h" />
-    <ClInclude Include="..\Editor\BinWriters.h" />
-    <ClInclude Include="..\Editor\CalculatorCRC32.h" />
-    <ClInclude Include="..\Editor\Converter.h" />
-    <ClInclude Include="..\Editor\DefaultNotesMaster.h" />
-    <ClInclude Include="..\Editor\DefaultNotesTheme.h" />
-    <ClInclude Include="..\Editor\FontCutter.h" />
-    <ClInclude Include="..\Editor\FontPicker.h" />
-    <ClInclude Include="..\Editor\imagemanager.h" />
-    <ClInclude Include="..\Editor\PPTXWriter.h" />
-    <ClInclude Include="..\Editor\WMFToImageConverter.h" />
-    <ClInclude Include="..\File.h" />
-    <ClInclude Include="..\PPTXFormat\App.h" />
-    <ClInclude Include="..\PPTXFormat\CommentAuthors.h" />
-    <ClInclude Include="..\PPTXFormat\Comments.h" />
-    <ClInclude Include="..\PPTXFormat\Core.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\Default.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\DefaultTable.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\ExtensionTable.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\File.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\Override.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\OverrideTable.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\XML\stringcommon.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\DateTime.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Drawing\LegacyDiagramText.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Drawing\VmlDrawing.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\External\External.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalAudio.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalImage.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalVideo.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\External\HyperLink.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\File.h" />
+    <ClInclude Include="..\PPTXFormat\FileContainer.h" />
+    <ClInclude Include="..\PPTXFormat\FileFactory.h" />
+    <ClInclude Include="..\PPTXFormat\FileMap.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\FileType.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\FileTypes.h" />
+    <ClInclude Include="..\PPTXFormat\Folder.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\IFileContainer.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Audio.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Image.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Media.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Video.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\NamespaceOwn.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\Namespaces.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\File.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\RelationShip.h" />
-    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\RelationTable.h" />
+    <ClInclude Include="..\PPTXFormat\PPTX.h" />
+    <ClInclude Include="..\PPTXFormat\PPTXEvent.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\RId.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\Unit.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\DocxFormat\UnknowTypeFile.h" />
+    <ClInclude Include="..\PPTXFormat\WrapperFile.h" />
+    <ClInclude Include="..\PPTXFormat\WrapperWritingElement.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\WritingElement.h" />
     <ClInclude Include="..\PPTXFormat\DocxFormat\WritingVector.h" />
-    <ClInclude Include="..\PPTXFormat\FileContainer.h" />
-    <ClInclude Include="..\PPTXFormat\FileFactory.h" />
-    <ClInclude Include="..\PPTXFormat\FileMap.h" />
-    <ClInclude Include="..\PPTXFormat\Folder.h" />
-    <ClInclude Include="..\PPTXFormat\HandoutMaster.h" />
     <ClInclude Include="..\PPTXFormat\Limit\AlbumLayout.h" />
     <ClInclude Include="..\PPTXFormat\Limit\AnimationDgmBuild.h" />
     <ClInclude Include="..\PPTXFormat\Limit\BaseLimit.h" />
@@ -499,6 +466,60 @@
     <ClInclude Include="..\PPTXFormat\Logic\Bg.h" />
     <ClInclude Include="..\PPTXFormat\Logic\BgPr.h" />
     <ClInclude Include="..\PPTXFormat\Logic\BodyPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Camera.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Cell3D.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\ClrMap.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\ClrMapOvr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CSld.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CustGeom.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\FillStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Gd.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Geometry.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Gs.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\HeadingVariant.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Hf.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\LightRig.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Lin.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\LineEnd.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\LineJoin.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\LineStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Ln.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\PartTitle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Path.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Path2D.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Ph.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\PrstDash.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\PrstGeom.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\PrstTxWarp.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Rect.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Rot.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Scene3d.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\SpTree.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\SpTreeElem.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\StyleRef.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\UniColor.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\UniEffect.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\UniFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\UniMedia.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\UniPath2D.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Xfrm.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\XmlId.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\Blip.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\BlipFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\GradFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\NoFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\PattFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\SolidFill.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\Stretch.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Fills\Tile.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\ColorBase.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\ColorModifier.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\PrstClr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\SchemeClr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\SrgbClr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Colors\SysClr.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuAutoNum.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuBlip.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuChar.h" />
@@ -513,32 +534,6 @@
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuSzPct.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuSzPts.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Bullets\BuSzTx.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Camera.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Cell3D.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\ClrMap.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\ClrMapOvr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvCxnSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvGraphicFramePr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvGrpSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvPicPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CNvSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\ColorBase.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\ColorModifier.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\PrstClr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\SchemeClr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\SrgbClr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Colors\SysClr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Controls.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CSld.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CustGeom.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Cxn.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\CxnSp.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\DefaultShapeDefinition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\EffectDag.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\EffectLst.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\EffectProperties.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\EffectStyle.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\AlphaBiLevel.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\AlphaCeiling.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\AlphaFloor.h" />
@@ -553,7 +548,11 @@
     <ClInclude Include="..\PPTXFormat\Logic\Effects\ClrChange.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\ClrRepl.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\Duotone.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\EffectDag.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\EffectElement.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\EffectLst.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\EffectProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\EffectStyle.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\FillEffect.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\FillOverlay.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\Glow.h" />
@@ -568,44 +567,6 @@
     <ClInclude Include="..\PPTXFormat\Logic\Effects\SoftEdge.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\TintEffect.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Effects\XfrmEffect.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\FillStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\Blip.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\BlipFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\GradFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\NoFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\PattFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\SolidFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\Stretch.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Fills\Tile.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\FontCollection.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\FontRef.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Gd.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Geometry.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\GraphicFrame.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\GrpSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Gs.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\HeadingVariant.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Hf.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Hyperlink.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\LightRig.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Lin.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\LineEnd.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\LineJoin.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\LineStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Ln.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Media\AudioCD.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Media\MediaFile.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Media\WavAudioFile.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvCxnSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvGraphicFramePr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvGrpSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvPicPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\NvSpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Paragraph.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\PartTitle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Path.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Path2D.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\ArcTo.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\Close.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\CubicBezTo.h" />
@@ -613,49 +574,23 @@
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\MoveTo.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\PathBase.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Path2D\QuadBezTo.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Ph.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Pic.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\PrstDash.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\PrstGeom.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\PrstTxWarp.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Rect.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Rot.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\RunElem.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\RunProperties.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Runs\Br.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Runs\Fld.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Runs\Run.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Runs\RunBase.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Scene3d.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Shape.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\ShapeProperties.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\ShapeStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\ShapeTextProperties.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\SmartArt.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Sp3d.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\SpPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\SpTree.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\SpTreeElem.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\StyleRef.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\SupplementalFont.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Tab.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TableBgStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TablePartStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TableStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\Table.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCell.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCellProperties.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCol.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\TableProperties.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Table\TableRow.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TcBdr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TcStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TcTxStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TextFit.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TextFont.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TextListStyle.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TextParagraphPr.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\TextSpacing.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\CornerDirectionTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\EightDirectionTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\EmptyTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\OptionalBlackTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\OrientationTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SideDirectionTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SndAc.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SplitTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\StSnd.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\Transition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\TransitionBase.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\WheelTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Transitions\ZoomTransition.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Timing\Anim.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Timing\AnimClr.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Timing\AnimEffect.h" />
@@ -696,51 +631,63 @@
     <ClInclude Include="..\PPTXFormat\Logic\Timing\TnLst.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Timing\TxEl.h" />
     <ClInclude Include="..\PPTXFormat\Logic\Timing\Video.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\CornerDirectionTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\EightDirectionTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\EmptyTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\OptionalBlackTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\OrientationTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SideDirectionTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SndAc.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\SplitTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\StSnd.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\Transition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\TransitionBase.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\WheelTransition.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Transitions\ZoomTransition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvGraphicFramePr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\GraphicFrame.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvGraphicFramePr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\SmartArt.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvCxnSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Cxn.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CxnSp.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvCxnSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvPicPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvPicPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Pic.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvGrpSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\GrpSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvGrpSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\FontCollection.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\FontRef.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Paragraph.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\RunElem.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\RunProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\SupplementalFont.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Tab.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TextFit.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TextFont.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TextListStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TextParagraphPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TextSpacing.h" />
     <ClInclude Include="..\PPTXFormat\Logic\TxBody.h" />
     <ClInclude Include="..\PPTXFormat\Logic\TxStyles.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\UniColor.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\UniEffect.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\UniFill.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\UniMedia.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\UniPath2D.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\Xfrm.h" />
-    <ClInclude Include="..\PPTXFormat\Logic\XmlId.h" />
-    <ClInclude Include="..\PPTXFormat\NotesMaster.h" />
-    <ClInclude Include="..\PPTXFormat\NotesSlide.h" />
-    <ClInclude Include="..\PPTXFormat\PPTX.h" />
-    <ClInclude Include="..\PPTXFormat\PPTXEvent.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\EmbeddedFont.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\EmbeddedFontDataId.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\Kinsoku.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\NotesSz.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\PhotoAlbum.h" />
-    <ClInclude Include="..\PPTXFormat\Presentation\SldSz.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TableBgStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TablePartStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TableStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TcBdr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TcStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\TcTxStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\CNvSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\DefaultShapeDefinition.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\NvSpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Shape.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\ShapeProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\ShapeStyle.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\ShapeTextProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Sp3d.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\SpPr.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Media\AudioCD.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Media\MediaFile.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Media\WavAudioFile.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\Table.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCell.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCellProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\TableCol.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\TableProperties.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Table\TableRow.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Controls.h" />
+    <ClInclude Include="..\PPTXFormat\Logic\Hyperlink.h" />
+    <ClInclude Include="..\PPTXFormat\App.h" />
+    <ClInclude Include="..\PPTXFormat\Core.h" />
     <ClInclude Include="..\PPTXFormat\PresProps.h" />
-    <ClInclude Include="..\PPTXFormat\Slide.h" />
-    <ClInclude Include="..\PPTXFormat\SlideLayout.h" />
-    <ClInclude Include="..\PPTXFormat\SlideMaster.h" />
-    <ClInclude Include="..\PPTXFormat\TableStyles.h" />
-    <ClInclude Include="..\PPTXFormat\Theme.h" />
-    <ClInclude Include="..\PPTXFormat\Theme\ClrScheme.h" />
-    <ClInclude Include="..\PPTXFormat\Theme\ExtraClrScheme.h" />
-    <ClInclude Include="..\PPTXFormat\Theme\FmtScheme.h" />
-    <ClInclude Include="..\PPTXFormat\Theme\FontScheme.h" />
-    <ClInclude Include="..\PPTXFormat\Theme\ThemeElements.h" />
-    <ClInclude Include="..\PPTXFormat\ViewProps.h" />
     <ClInclude Include="..\PPTXFormat\ViewProps\CSldViewPr.h" />
     <ClInclude Include="..\PPTXFormat\ViewProps\CViewPr.h" />
     <ClInclude Include="..\PPTXFormat\ViewProps\GridSpacing.h" />
@@ -756,15 +703,67 @@
     <ClInclude Include="..\PPTXFormat\ViewProps\Sld.h" />
     <ClInclude Include="..\PPTXFormat\ViewProps\SlideViewPr.h" />
     <ClInclude Include="..\PPTXFormat\ViewProps\SorterViewPr.h" />
-    <ClInclude Include="..\PPTXFormat\WrapperFile.h" />
-    <ClInclude Include="..\PPTXFormat\WrapperWritingElement.h" />
+    <ClInclude Include="..\PPTXFormat\ViewProps.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\EmbeddedFont.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\EmbeddedFontDataId.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\Kinsoku.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\NotesSz.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\PhotoAlbum.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation.h" />
+    <ClInclude Include="..\PPTXFormat\Presentation\SldSz.h" />
+    <ClInclude Include="..\PPTXFormat\Slide.h" />
+    <ClInclude Include="..\PPTXFormat\Theme\ClrScheme.h" />
+    <ClInclude Include="..\PPTXFormat\Theme\ExtraClrScheme.h" />
+    <ClInclude Include="..\PPTXFormat\Theme\FmtScheme.h" />
+    <ClInclude Include="..\PPTXFormat\Theme\FontScheme.h" />
+    <ClInclude Include="..\PPTXFormat\Theme.h" />
+    <ClInclude Include="..\PPTXFormat\Theme\ThemeElements.h" />
+    <ClInclude Include="..\PPTXFormat\SlideLayout.h" />
+    <ClInclude Include="..\PPTXFormat\NotesMaster.h" />
+    <ClInclude Include="..\PPTXFormat\NotesSlide.h" />
+    <ClInclude Include="..\PPTXFormat\SlideMaster.h" />
+    <ClInclude Include="..\PPTXFormat\HandoutMaster.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\Default.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\DefaultTable.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\ExtensionTable.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\File.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\Override.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\ContentTypes\OverrideTable.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\File.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\RelationShip.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Rels\RelationTable.h" />
+    <ClInclude Include="..\PPTXFormat\TableStyles.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Audio.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Image.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Media.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Media\Video.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\External\External.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalAudio.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalImage.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\External\ExternalVideo.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\External\HyperLink.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Drawing\LegacyDiagramText.h" />
+    <ClInclude Include="..\PPTXFormat\DocxFormat\Drawing\VmlDrawing.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\File.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\FileSystem\FileSystem.h" />
+    <ClInclude Include="..\..\Common\DocxFormat\Source\SystemUtility\SystemUtility.h" />
+    <ClInclude Include="..\Directory.h" />
+    <ClInclude Include="..\File.h" />
     <ClInclude Include="..\Settings.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ASCHTMLRenderer\ASCHTMLRendererLib.vcxproj">
-      <Project>{dc24710e-8df2-4a7a-b7c3-2313e294143c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
+    <ClInclude Include="..\PPTXFormat\CommentAuthors.h" />
+    <ClInclude Include="..\PPTXFormat\Comments.h" />
+    <ClInclude Include="..\Editor\BinaryFileReaderWriter.h" />
+    <ClInclude Include="..\Editor\BinReaderWriterDefines.h" />
+    <ClInclude Include="..\Editor\BinWriters.h" />
+    <ClInclude Include="..\Editor\CalculatorCRC32.h" />
+    <ClInclude Include="..\Editor\Converter.h" />
+    <ClInclude Include="..\Editor\DefaultNotesMaster.h" />
+    <ClInclude Include="..\Editor\DefaultNotesTheme.h" />
+    <ClInclude Include="..\Editor\FontCutter.h" />
+    <ClInclude Include="..\Editor\FontPicker.h" />
+    <ClInclude Include="..\Editor\imagemanager.h" />
+    <ClInclude Include="..\Editor\PPTXWriter.h" />
+    <ClInclude Include="..\Editor\WMFToImageConverter.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj.filters

@@ -2,150 +2,150 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{1135223c-7cfc-40e0-80a7-59ec22d73741}</UniqueIdentifier>
+      <UniqueIdentifier>{c36d0077-a3c7-41e4-aa90-b48711ad8e8f}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{25ea7a70-c9bd-43d9-93c7-b0501c5f412c}</UniqueIdentifier>
+      <UniqueIdentifier>{476b1213-3b89-452b-bcdf-5d8186b111a9}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
     </Filter>
     <Filter Include="EditorSource">
-      <UniqueIdentifier>{5b13dfa3-d0c1-4b64-bbe3-4ddd755e9312}</UniqueIdentifier>
+      <UniqueIdentifier>{2fa683c9-192f-4816-ae05-9ec41ffebc7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX">
-      <UniqueIdentifier>{9becc444-5bcd-43c6-a25f-b0ae63def849}</UniqueIdentifier>
+      <UniqueIdentifier>{e2c272e8-550d-432e-beda-809d229a495c}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source">
-      <UniqueIdentifier>{77d0d3b5-4098-49bd-ae2c-a4bd217c174c}</UniqueIdentifier>
+      <UniqueIdentifier>{eb9ec60a-051f-4dcf-ae86-296e67310684}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Limit">
-      <UniqueIdentifier>{039fbff8-7b96-4141-aa6a-63ea3f553c58}</UniqueIdentifier>
+      <UniqueIdentifier>{62ace3ca-d77d-4f4a-b008-70a4fce0a8c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic">
-      <UniqueIdentifier>{b3a3ff8e-e7b7-4e77-84f7-d1653e2db5a9}</UniqueIdentifier>
+      <UniqueIdentifier>{aeafeee1-3ad2-4b5d-a62a-83bd72e154c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Fills">
-      <UniqueIdentifier>{42bb56bc-de11-4a8e-aad3-34dc4b862852}</UniqueIdentifier>
+      <UniqueIdentifier>{ab5e7301-a177-4df0-ad80-d20fa074a447}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Colors">
-      <UniqueIdentifier>{005e8d55-9cd6-4133-9074-cfceb1f0c942}</UniqueIdentifier>
+      <UniqueIdentifier>{d1505c58-d394-4536-97b8-8253db990235}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Bullets">
-      <UniqueIdentifier>{ffe2586d-2ba6-47b1-9a10-3b6981995f4c}</UniqueIdentifier>
+      <UniqueIdentifier>{647cdf33-1ceb-46d9-9057-fff9a7de483a}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Effects">
-      <UniqueIdentifier>{09cf7708-f37c-41c9-ac08-cd8cfbeb0a22}</UniqueIdentifier>
+      <UniqueIdentifier>{86aeee42-4677-40bc-8539-874ba5bb0d50}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Path2D">
-      <UniqueIdentifier>{2a19ff60-fd7a-4bab-b4f6-5a778b99ea39}</UniqueIdentifier>
+      <UniqueIdentifier>{d3c520b7-c33d-4659-8727-14cb47143339}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Runs">
-      <UniqueIdentifier>{81a8487e-254b-43c3-850e-721d211a60c9}</UniqueIdentifier>
+      <UniqueIdentifier>{2758289a-ac7b-4b7b-a8b7-f580e2544780}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Transitions">
-      <UniqueIdentifier>{17a68d25-dedf-47cc-854c-da0e6342da6a}</UniqueIdentifier>
+      <UniqueIdentifier>{c6bb2f59-2873-4a78-9123-2c992a8701f2}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Timing">
-      <UniqueIdentifier>{23e5c13e-2088-4000-8412-f84b1a469fb8}</UniqueIdentifier>
+      <UniqueIdentifier>{abe42048-2877-475a-a305-b03a479f8f73}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\GraphicFrame">
-      <UniqueIdentifier>{f467e0a4-c6d7-48d4-a9b3-73ccfe76262b}</UniqueIdentifier>
+      <UniqueIdentifier>{6cedd748-cb36-4c42-90e6-7aea0f11b664}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Cxn">
-      <UniqueIdentifier>{5adf8b01-fa7b-4c2c-af38-355e2fea4119}</UniqueIdentifier>
+      <UniqueIdentifier>{f32c7b15-fac7-4b2c-acee-c951707ea082}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Pic">
-      <UniqueIdentifier>{c6b3533d-8d80-4ee3-82f0-e01d2a8d4db0}</UniqueIdentifier>
+      <UniqueIdentifier>{3cddcb8c-379c-4d88-8d61-4caa8abbc6de}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\GrpSp">
-      <UniqueIdentifier>{6b722571-ae46-4e4b-bf1d-cdf6caac2f87}</UniqueIdentifier>
+      <UniqueIdentifier>{2cec747a-0b49-4264-91d3-3db0ff551458}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Text">
-      <UniqueIdentifier>{c95ec707-2b4e-4a15-a30c-536507c8f611}</UniqueIdentifier>
+      <UniqueIdentifier>{3bfb6456-df1f-4008-bf95-b3edd6528594}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Tables">
-      <UniqueIdentifier>{1ce9dd18-c4c0-407a-8d28-a619fa1339ff}</UniqueIdentifier>
+      <UniqueIdentifier>{70e4f734-36fa-4d08-861b-6ff02a14dfa3}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Shape">
-      <UniqueIdentifier>{6c87beb1-5b94-4803-b034-fbf9bc610c12}</UniqueIdentifier>
+      <UniqueIdentifier>{ca9516de-26f4-4e73-a024-4c72806a581a}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Media">
-      <UniqueIdentifier>{e2dcdee1-e638-46bd-813a-f58a5da49e60}</UniqueIdentifier>
+      <UniqueIdentifier>{d5848200-3d28-4353-b602-4572f7fcb79f}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Table">
-      <UniqueIdentifier>{4232bc60-376a-45ac-94ff-4ed39360239b}</UniqueIdentifier>
+      <UniqueIdentifier>{4798f876-f4a5-46a3-aa15-c065f1fb2228}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\ActiveXControls">
-      <UniqueIdentifier>{4c2c2052-167d-49c9-9408-f04d8178a6ad}</UniqueIdentifier>
+      <UniqueIdentifier>{e9e0f728-4761-4c04-b3bd-3f0d9c01eb18}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Logic\Hyperlinks">
-      <UniqueIdentifier>{120c6cb1-942c-4fd7-b4cd-6cb69ac847bb}</UniqueIdentifier>
+      <UniqueIdentifier>{66a679b8-bab7-4e0f-8421-5f35fdc1e34f}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\App">
-      <UniqueIdentifier>{3500a994-5a6b-4adc-890c-7ab08808d254}</UniqueIdentifier>
+      <UniqueIdentifier>{ddc18d64-3bfb-4977-8b56-f8083f264260}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Core">
-      <UniqueIdentifier>{e1100e2d-4a8b-4a9c-8764-67b45027d48c}</UniqueIdentifier>
+      <UniqueIdentifier>{0c828046-d354-4ec4-9a0a-2e4998dff0ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\PresProps">
-      <UniqueIdentifier>{082fefa7-5f47-4e92-8493-37a4dcf30539}</UniqueIdentifier>
+      <UniqueIdentifier>{c0a13a26-74b0-4895-b4c8-ae070662b3cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\ViewProps">
-      <UniqueIdentifier>{0f0a965a-a836-47de-bd28-f59a1d169c4b}</UniqueIdentifier>
+      <UniqueIdentifier>{066fab34-c44b-4950-850e-0783bb4fcc3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Presentation">
-      <UniqueIdentifier>{349984db-b439-44a9-a26e-da8e33adfc61}</UniqueIdentifier>
+      <UniqueIdentifier>{85695bb6-45ee-40d7-a1af-6becc756930b}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Slides">
-      <UniqueIdentifier>{83573e36-c948-4a13-be24-de716dfafd22}</UniqueIdentifier>
+      <UniqueIdentifier>{f001ddc1-1ec2-47f3-9e02-4165891e1fef}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Theme">
-      <UniqueIdentifier>{d4baa3c8-6f48-4ffb-b831-5415426b78a9}</UniqueIdentifier>
+      <UniqueIdentifier>{42fd58c3-5e39-448c-b629-cb28874c9f14}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\SlideLayouts">
-      <UniqueIdentifier>{a3c03015-0652-4db0-aa8b-dbe68e4577d0}</UniqueIdentifier>
+      <UniqueIdentifier>{e11c8f2f-cc2b-44e6-bc53-a5556613faad}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\NotesMasters">
-      <UniqueIdentifier>{1c752396-790d-4f2a-95f4-0f2838de5ba4}</UniqueIdentifier>
+      <UniqueIdentifier>{7fd21565-a385-4ab3-a407-3c63cea5dfb7}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\NotesSlide">
-      <UniqueIdentifier>{e3e35897-dca3-4426-8308-34470faacffd}</UniqueIdentifier>
+      <UniqueIdentifier>{016ee8be-65dd-41f3-9a49-687e22f96ee1}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\SlideMasters">
-      <UniqueIdentifier>{5a40058c-89af-4e66-acc2-8d409d326dae}</UniqueIdentifier>
+      <UniqueIdentifier>{98126d7f-88ca-4b46-8522-6466201ad82e}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\HandoutMasters">
-      <UniqueIdentifier>{742a5122-e0a6-4be3-b685-833d86c22409}</UniqueIdentifier>
+      <UniqueIdentifier>{9e123862-0497-4852-8865-1661c57d2822}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\ContentTypes">
-      <UniqueIdentifier>{82883dfe-0af4-427a-86d2-3b4178cafb4c}</UniqueIdentifier>
+      <UniqueIdentifier>{0b7f9602-ce50-46c2-916f-f8385833bcac}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Rels">
-      <UniqueIdentifier>{79d63efa-9e06-489d-8fa8-0d1fcd2fb23b}</UniqueIdentifier>
+      <UniqueIdentifier>{a19cc111-d058-4141-bd7d-41c069c23ec1}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\TableStyles">
-      <UniqueIdentifier>{7db8ee5e-f18c-46e9-af01-a003e1bf7117}</UniqueIdentifier>
+      <UniqueIdentifier>{803d9d61-70e0-436e-8163-2413dd4007bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Media">
-      <UniqueIdentifier>{0b4da421-d41a-45f4-bae5-0afba2f91de4}</UniqueIdentifier>
+      <UniqueIdentifier>{85b8c08c-de73-4ca7-a255-9bb2d0e24444}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\External">
-      <UniqueIdentifier>{bddf1e6d-f03c-488e-a3f0-55e5500e4f72}</UniqueIdentifier>
+      <UniqueIdentifier>{13df52d9-ebe0-43d3-8e47-b3d7c77bf1be}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\VectorML">
-      <UniqueIdentifier>{5c562c35-aa54-40f9-8954-d81226f3c312}</UniqueIdentifier>
+      <UniqueIdentifier>{4d53c20e-6023-4dad-b8e6-ed32ddb48076}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Common">
-      <UniqueIdentifier>{5b451db1-f280-401e-b215-0db6932992b5}</UniqueIdentifier>
+      <UniqueIdentifier>{e30701b8-ace8-4e8a-a714-2f283393c6d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Common\System">
-      <UniqueIdentifier>{d8d66754-be41-47c7-bfbd-6fb4059f880b}</UniqueIdentifier>
+      <UniqueIdentifier>{d2799cb9-6533-46cc-a9e2-13f30979af20}</UniqueIdentifier>
     </Filter>
     <Filter Include="PPTX\Source\Comments">
-      <UniqueIdentifier>{28372421-0c4a-4e88-a7b4-87d946383f3a}</UniqueIdentifier>
+      <UniqueIdentifier>{fe1f9877-af6d-4528-aeba-1951b7d39015}</UniqueIdentifier>
     </Filter>
     <Filter Include="Editor">
-      <UniqueIdentifier>{ded667a1-bcff-415e-939d-c52dd5e557bb}</UniqueIdentifier>
+      <UniqueIdentifier>{42373d3e-a32f-432d-bb66-6b66270ac8da}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -164,16 +164,16 @@
     <ClCompile Include="..\Editor\BinaryFileReaderWriter.cpp">
       <Filter>EditorSource</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\Elements.cpp">
+    <ClCompile Include="..\Editor\Drawing\Elements.cpp">
       <Filter>EditorSource</Filter>
     </ClCompile>
     <ClCompile Include="..\Editor\FontPicker.cpp">
       <Filter>EditorSource</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp">
+    <ClCompile Include="..\Editor\Drawing\Layout.cpp">
       <Filter>EditorSource</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ASCPresentationEditor\OfficeDrawing\TextAttributesEx.cpp">
+    <ClCompile Include="..\Editor\Drawing\TextAttributesEx.cpp">
       <Filter>EditorSource</Filter>
     </ClCompile>
     <ClCompile Include="..\PPTXFormat\FileContainer.cpp">
@@ -239,6 +239,9 @@
     <ClCompile Include="..\PPTXFormat\Logic\Colors\SchemeClr.cpp">
       <Filter>PPTX\Source\Logic\Colors</Filter>
     </ClCompile>
+    <ClCompile Include="..\PPTXFormat\Logic\Runs\MathParaWrapper.cpp">
+      <Filter>PPTX\Source\Logic\Runs</Filter>
+    </ClCompile>
     <ClCompile Include="..\PPTXFormat\Logic\Transitions\TransitionBase.cpp">
       <Filter>PPTX\Source\Logic\Transitions</Filter>
     </ClCompile>
@@ -290,6 +293,9 @@
     <ClCompile Include="..\File.cpp">
       <Filter>PPTX\Source\Common\System</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\HtmlRenderer\src\ASCSVGWriter.cpp">
+      <Filter>Editor</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\ASCOfficeDrawingConverter.h">

ASCOfficeXlsFile2/ASCOfficeXlsFileTest/ASCOfficeXlsFileTest.vcproj

@@ -47,7 +47,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -353,6 +353,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\Common\3dParty\icu\win_32\lib\icudt.lib"
+				>
+			</File>
+			<File
+				RelativePath="..\..\Common\3dParty\icu\win_32\lib\icuuc.lib"
+				>
+			</File>
 			<File
 				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 				>
@@ -366,14 +374,6 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\..\build\bin\icu\win_32\icudt.lib"
-			>
-		</File>
-		<File
-			RelativePath="..\..\build\bin\icu\win_32\icuuc.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj

@@ -50,7 +50,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool

ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj

@@ -50,7 +50,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool

ASCOfficeXlsFile2/win32/ASCOfficeXlsFile2.sln

@@ -8,18 +8,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\source\win3
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsXlsxConverter", "..\source\win32\XlsXlsxConverter.vcproj", "{CBEDD0D1-10A8-45C1-AF81-8492F40964CA}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
 		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeXlsFileTest", "..\ASCOfficeXlsFileTest\ASCOfficeXlsFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(ProjectDependencies) = postProject
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
 		{CBEDD0D1-10A8-45C1-AF81-8492F40964CA} = {CBEDD0D1-10A8-45C1-AF81-8492F40964CA}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"

Common/3dParty/cryptopp/cryptlib.vcproj

@@ -339,8 +339,9 @@
 				EnableEnhancedInstructionSet="1"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="pch.h"
-				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"
-				WarningLevel="4"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
 			/>

Common/DocxFormat/Projects/DocxFormat2005.vcxproj

@@ -92,11 +92,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\lib;D:\WORK\boost\1_60_0\stage\lib\i386;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\include;D:\WORK\boost\1_60_0;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\XML\include;C:\__Work\core\Common\3dParty\curl\include;C:\__Work\core\DesktopEditor\freetype-2.5.2\include;C:\__Work\core\UnicodeConverter\icubuilds\win_32\include;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\win_build;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
@@ -122,7 +124,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.\..\Source\XML\libxml2\XML\include;.\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\..\..\Redist;..\..\..\..\..\..\ASCOfficeOdtFile\Source\OfficeSvmFile;.\..\Source\Base;.\..\Source\SystemUtility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -132,7 +134,7 @@
     </ClCompile>
     <Lib>
       <AdditionalDependencies>urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -220,40 +222,54 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\Source\Base\ASCString.h" />
-    <ClInclude Include="..\Source\Base\Base.h" />
-    <ClInclude Include="..\Source\Base\Nullable.h" />
-    <ClInclude Include="..\Source\Base\SmartPtr.h" />
-    <ClInclude Include="..\Source\Base\unicode_util.h" />
-    <ClInclude Include="..\Source\Common\AbstractConverter.h" />
-    <ClInclude Include="..\Source\Common\Align.h" />
-    <ClInclude Include="..\Source\Common\Color.h" />
-    <ClInclude Include="..\Source\Common\Common.h" />
-    <ClInclude Include="..\Source\Common\ComplexTypes.h" />
-    <ClInclude Include="..\Source\Common\Encoding.h" />
-    <ClInclude Include="..\Source\Common\Index.h" />
-    <ClInclude Include="..\Source\Common\NumFormat.h" />
-    <ClInclude Include="..\Source\Common\Point.h" />
-    <ClInclude Include="..\Source\Common\Position.h" />
-    <ClInclude Include="..\Source\Common\SimpleTypes_Base.h" />
-    <ClInclude Include="..\Source\Common\SimpleTypes_Drawing.h" />
-    <ClInclude Include="..\Source\Common\SimpleTypes_Shared.h" />
-    <ClInclude Include="..\Source\Common\SimpleTypes_Vml.h" />
-    <ClInclude Include="..\Source\Common\SimpleTypes_Word.h" />
-    <ClInclude Include="..\Source\Common\Size.h" />
-    <ClInclude Include="..\Source\Common\Unit.h" />
-    <ClInclude Include="..\Source\Common\Utils.h" />
-    <ClInclude Include="..\Source\Common\Wrap.h" />
-    <ClInclude Include="..\Source\Common\ZIndex.h" />
+    <ClInclude Include="..\Source\DocxFormat\Rels.h" />
     <ClInclude Include="..\Source\DocxFormat\App.h" />
-    <ClInclude Include="..\Source\DocxFormat\Bibliography.h" />
-    <ClInclude Include="..\Source\DocxFormat\Comments.h" />
-    <ClInclude Include="..\Source\DocxFormat\ContentTypes.h" />
     <ClInclude Include="..\Source\DocxFormat\Core.h" />
+    <ClInclude Include="..\Source\DocxFormat\WebSettings.h" />
+    <ClInclude Include="..\Source\DocxFormat\Settings\Settings.h" />
+    <ClInclude Include="..\Source\DocxFormat\Theme\Theme.h" />
+    <ClInclude Include="..\Source\DocxFormat\Theme\ThemeOverride.h" />
+    <ClInclude Include="..\Source\DocxFormat\ContentTypes.h" />
+    <ClInclude Include="..\Source\DocxFormat\Styles.h" />
     <ClInclude Include="..\Source\DocxFormat\CustomXml.h" />
-    <ClInclude Include="..\Source\DocxFormat\Diagram\DiagramDrawing.h" />
     <ClInclude Include="..\Source\DocxFormat\Document.h" />
-    <ClInclude Include="..\Source\DocxFormat\Docx.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Table.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\TableProperty.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\FldChar.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\FldSimple.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Hyperlink.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Dir.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\SmartTag.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Sdt.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Paragraph.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\ParagraphProperty.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\AlternateContent.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Bdo.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Run.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\RunContent.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\RunProperty.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Annotations.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Pict.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Shape.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\SectionProperty.h" />
+    <ClInclude Include="..\Source\DocxFormat\Numbering.h" />
+    <ClInclude Include="..\Source\DocxFormat\Bibliography.h" />
+    <ClInclude Include="..\Source\DocxFormat\Endnote.h" />
+    <ClInclude Include="..\Source\DocxFormat\Footnote.h" />
+    <ClInclude Include="..\Source\DocxFormat\FtnEdn.h" />
+    <ClInclude Include="..\Source\DocxFormat\HeaderFooter.h" />
+    <ClInclude Include="..\Source\DocxFormat\Font.h" />
+    <ClInclude Include="..\Source\DocxFormat\FontTable.h" />
+    <ClInclude Include="..\Source\DocxFormat\Media\Audio.h" />
+    <ClInclude Include="..\Source\DocxFormat\Media\Image.h" />
+    <ClInclude Include="..\Source\DocxFormat\Media\Media.h" />
+    <ClInclude Include="..\Source\DocxFormat\Media\OleObject.h" />
+    <ClInclude Include="..\Source\DocxFormat\Media\Video.h" />
+    <ClInclude Include="..\Source\DocxFormat\External\External.h" />
+    <ClInclude Include="..\Source\DocxFormat\External\ExternalAudio.h" />
+    <ClInclude Include="..\Source\DocxFormat\External\ExternalImage.h" />
+    <ClInclude Include="..\Source\DocxFormat\External\ExternalVideo.h" />
+    <ClInclude Include="..\Source\DocxFormat\External\HyperLink.h" />
     <ClInclude Include="..\Source\DocxFormat\Drawing\Drawing.h" />
     <ClInclude Include="..\Source\DocxFormat\Drawing\Drawing3D.h" />
     <ClInclude Include="..\Source\DocxFormat\Drawing\DrawingBody.h" />
@@ -275,83 +291,44 @@
     <ClInclude Include="..\Source\DocxFormat\Drawing\DrawingText.h" />
     <ClInclude Include="..\Source\DocxFormat\Drawing\DrawingTextProperties.h" />
     <ClInclude Include="..\Source\DocxFormat\Drawing\DrawingTransform.h" />
-    <ClInclude Include="..\Source\DocxFormat\Endnote.h" />
-    <ClInclude Include="..\Source\DocxFormat\External\External.h" />
-    <ClInclude Include="..\Source\DocxFormat\External\ExternalAudio.h" />
-    <ClInclude Include="..\Source\DocxFormat\External\ExternalImage.h" />
-    <ClInclude Include="..\Source\DocxFormat\External\ExternalVideo.h" />
-    <ClInclude Include="..\Source\DocxFormat\External\HyperLink.h" />
-    <ClInclude Include="..\Source\DocxFormat\File.h" />
-    <ClInclude Include="..\Source\DocxFormat\FileFactory.h" />
-    <ClInclude Include="..\Source\DocxFormat\FileType.h" />
-    <ClInclude Include="..\Source\DocxFormat\FileTypes.h" />
-    <ClInclude Include="..\Source\DocxFormat\Font.h" />
-    <ClInclude Include="..\Source\DocxFormat\FontTable.h" />
-    <ClInclude Include="..\Source\DocxFormat\Footnote.h" />
-    <ClInclude Include="..\Source\DocxFormat\FtnEdn.h" />
-    <ClInclude Include="..\Source\DocxFormat\HeaderFooter.h" />
-    <ClInclude Include="..\Source\DocxFormat\IFileBuilder.h" />
-    <ClInclude Include="..\Source\DocxFormat\IFileContainer.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\AlternateContent.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Annotations.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Bdo.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Dir.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\FldChar.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\FldSimple.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Hyperlink.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Paragraph.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\ParagraphProperty.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Pict.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Run.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\RunContent.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\RunProperty.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Sdt.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\SectionProperty.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Shape.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\SmartTag.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Table.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\TableProperty.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\Vml.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\VmlOfficeDrawing.h" />
-    <ClInclude Include="..\Source\DocxFormat\Logic\VmlWord.h" />
-    <ClInclude Include="..\Source\DocxFormat\Math\oMath.h" />
-    <ClInclude Include="..\Source\DocxFormat\Math\oMathBottomNodes.h" />
-    <ClInclude Include="..\Source\DocxFormat\Math\oMathContent.h" />
-    <ClInclude Include="..\Source\DocxFormat\Math\oMathPara.h" />
-    <ClInclude Include="..\Source\DocxFormat\Media\Audio.h" />
-    <ClInclude Include="..\Source\DocxFormat\Media\Image.h" />
-    <ClInclude Include="..\Source\DocxFormat\Media\Media.h" />
-    <ClInclude Include="..\Source\DocxFormat\Media\OleObject.h" />
-    <ClInclude Include="..\Source\DocxFormat\Media\Video.h" />
-    <ClInclude Include="..\Source\DocxFormat\NamespaceOwn.h" />
-    <ClInclude Include="..\Source\DocxFormat\Namespaces.h" />
-    <ClInclude Include="..\Source\DocxFormat\Numbering.h" />
-    <ClInclude Include="..\Source\DocxFormat\Rels.h" />
-    <ClInclude Include="..\Source\DocxFormat\RId.h" />
-    <ClInclude Include="..\Source\DocxFormat\Settings\Settings.h" />
-    <ClInclude Include="..\Source\DocxFormat\Styles.h" />
-    <ClInclude Include="..\Source\DocxFormat\Theme\Theme.h" />
-    <ClInclude Include="..\Source\DocxFormat\Theme\ThemeOverride.h" />
-    <ClInclude Include="..\Source\DocxFormat\UnknowTypeFile.h" />
-    <ClInclude Include="..\Source\DocxFormat\VmlDrawing.h" />
-    <ClInclude Include="..\Source\DocxFormat\WebSettings.h" />
-    <ClInclude Include="..\Source\DocxFormat\WritingElement.h" />
-    <ClInclude Include="..\Source\DocxFormat\WritingVector.h" />
-    <ClInclude Include="..\Source\MathEquation\LEStream.h" />
-    <ClInclude Include="..\Source\MathEquation\MathEquation.h" />
-    <ClInclude Include="..\Source\MathEquation\OutputDev.h" />
-    <ClInclude Include="..\Source\MathEquation\String.h" />
-    <ClInclude Include="..\Source\MathEquation\Types.h" />
     <ClInclude Include="..\Source\SystemUtility\FileSystem\Directory.h" />
     <ClInclude Include="..\Source\SystemUtility\FileSystem\File.h" />
     <ClInclude Include="..\Source\SystemUtility\SystemUtility.h" />
+    <ClInclude Include="..\Source\Common\AbstractConverter.h" />
+    <ClInclude Include="..\Source\Common\Align.h" />
+    <ClInclude Include="..\Source\Common\Color.h" />
+    <ClInclude Include="..\Source\Common\Common.h" />
+    <ClInclude Include="..\Source\Common\ComplexTypes.h" />
+    <ClInclude Include="..\Source\Common\Encoding.h" />
+    <ClInclude Include="..\Source\Common\Index.h" />
+    <ClInclude Include="..\Source\Common\NumFormat.h" />
+    <ClInclude Include="..\Source\Common\Point.h" />
+    <ClInclude Include="..\Source\Common\Position.h" />
+    <ClInclude Include="..\Source\Common\SimpleTypes_Base.h" />
+    <ClInclude Include="..\Source\Common\SimpleTypes_Drawing.h" />
+    <ClInclude Include="..\Source\Common\SimpleTypes_Shared.h" />
+    <ClInclude Include="..\Source\Common\SimpleTypes_Vml.h" />
+    <ClInclude Include="..\Source\Common\SimpleTypes_Word.h" />
+    <ClInclude Include="..\Source\Common\Size.h" />
+    <ClInclude Include="..\Source\Common\Unit.h" />
+    <ClInclude Include="..\Source\Common\Utils.h" />
+    <ClInclude Include="..\Source\Common\Wrap.h" />
+    <ClInclude Include="..\Source\Common\ZIndex.h" />
+    <ClInclude Include="..\Source\DocxFormat\Comments.h" />
+    <ClInclude Include="..\Source\XlsxFormat\Common.h" />
+    <ClInclude Include="..\Source\XlsxFormat\CommonInclude.h" />
+    <ClInclude Include="..\Source\XlsxFormat\ComplexTypes_Spreadsheet.h" />
+    <ClInclude Include="..\Source\XlsxFormat\FileFactory_Spreadsheet.h" />
+    <ClInclude Include="..\Source\XlsxFormat\FileTypes_Spreadsheet.h" />
+    <ClInclude Include="..\Source\XlsxFormat\IFileContainer_Spreadsheet.h" />
+    <ClInclude Include="..\Source\XlsxFormat\SimpleTypes_Spreadsheet.h" />
+    <ClInclude Include="..\Source\XlsxFormat\Workbook.h" />
+    <ClInclude Include="..\Source\XlsxFormat\WritingElement.h" />
+    <ClInclude Include="..\Source\XlsxFormat\Xlsx.h" />
     <ClInclude Include="..\Source\XlsxFormat\CalcChain\CalcChain.h" />
     <ClInclude Include="..\Source\XlsxFormat\Chart\Chart.h" />
     <ClInclude Include="..\Source\XlsxFormat\Chart\ChartSerialize.h" />
     <ClInclude Include="..\Source\XlsxFormat\Comments\Comments.h" />
-    <ClInclude Include="..\Source\XlsxFormat\Common.h" />
-    <ClInclude Include="..\Source\XlsxFormat\CommonInclude.h" />
-    <ClInclude Include="..\Source\XlsxFormat\ComplexTypes_Spreadsheet.h" />
     <ClInclude Include="..\Source\XlsxFormat\Drawing\CellAnchor.h" />
     <ClInclude Include="..\Source\XlsxFormat\Drawing\Drawing.h" />
     <ClInclude Include="..\Source\XlsxFormat\Drawing\FromTo.h" />
@@ -360,18 +337,12 @@
     <ClInclude Include="..\Source\XlsxFormat\Drawing\Pic.h" />
     <ClInclude Include="..\Source\XlsxFormat\Drawing\Pos.h" />
     <ClInclude Include="..\Source\XlsxFormat\Drawing\Shape.h" />
-    <ClInclude Include="..\Source\XlsxFormat\ExternalLinks\ExternalLinkPath.h" />
-    <ClInclude Include="..\Source\XlsxFormat\ExternalLinks\ExternalLinks.h" />
-    <ClInclude Include="..\Source\XlsxFormat\FileFactory_Spreadsheet.h" />
-    <ClInclude Include="..\Source\XlsxFormat\FileTypes_Spreadsheet.h" />
-    <ClInclude Include="..\Source\XlsxFormat\IFileContainer_Spreadsheet.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\PhoneticPr.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\rPr.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\Run.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\SharedStrings.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\Si.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\Text.h" />
-    <ClInclude Include="..\Source\XlsxFormat\SimpleTypes_Spreadsheet.h" />
     <ClInclude Include="..\Source\XlsxFormat\Styles\Borders.h" />
     <ClInclude Include="..\Source\XlsxFormat\Styles\CellStyles.h" />
     <ClInclude Include="..\Source\XlsxFormat\Styles\Colors.h" />
@@ -385,7 +356,6 @@
     <ClInclude Include="..\Source\XlsxFormat\Styles\Xfs.h" />
     <ClInclude Include="..\Source\XlsxFormat\Table\Autofilter.h" />
     <ClInclude Include="..\Source\XlsxFormat\Table\Table.h" />
-    <ClInclude Include="..\Source\XlsxFormat\Workbook.h" />
     <ClInclude Include="..\Source\XlsxFormat\Workbook\BookViews.h" />
     <ClInclude Include="..\Source\XlsxFormat\Workbook\DefinedNames.h" />
     <ClInclude Include="..\Source\XlsxFormat\Workbook\ExternalReferences.h" />
@@ -399,45 +369,66 @@
     <ClInclude Include="..\Source\XlsxFormat\Worksheets\SheetData.h" />
     <ClInclude Include="..\Source\XlsxFormat\Worksheets\Worksheet.h" />
     <ClInclude Include="..\Source\XlsxFormat\Worksheets\WorksheetChildOther.h" />
-    <ClInclude Include="..\Source\XlsxFormat\WritingElement.h" />
-    <ClInclude Include="..\Source\XlsxFormat\Xlsx.h" />
+    <ClInclude Include="..\Source\XlsxFormat\ExternalLinks\ExternalLinkPath.h" />
+    <ClInclude Include="..\Source\XlsxFormat\ExternalLinks\ExternalLinks.h" />
+    <ClInclude Include="..\Source\DocxFormat\Math\oMath.h" />
+    <ClInclude Include="..\Source\DocxFormat\Math\oMathBottomNodes.h" />
+    <ClInclude Include="..\Source\DocxFormat\Math\oMathContent.h" />
+    <ClInclude Include="..\Source\DocxFormat\Math\oMathPara.h" />
+    <ClInclude Include="..\Source\DocxFormat\Diagram\DiagramDrawing.h" />
+    <ClInclude Include="..\Source\Base\ASCString.h" />
+    <ClInclude Include="..\Source\Base\Base.h" />
+    <ClInclude Include="..\Source\Base\Nullable.h" />
+    <ClInclude Include="..\Source\Base\SmartPtr.h" />
+    <ClInclude Include="..\Source\Base\unicode_util.h" />
     <ClInclude Include="..\Source\XML\stringcommon.h" />
     <ClInclude Include="..\Source\XML\StringWriter.h" />
     <ClInclude Include="..\Source\XML\Utils.h" />
     <ClInclude Include="..\Source\XML\XmlSimple.h" />
     <ClInclude Include="..\Source\XML\xmlutils.h" />
+    <ClInclude Include="..\Source\MathEquation\LEStream.h" />
+    <ClInclude Include="..\Source\MathEquation\MathEquation.h" />
+    <ClInclude Include="..\Source\MathEquation\OutputDev.h" />
+    <ClInclude Include="..\Source\MathEquation\String.h" />
+    <ClInclude Include="..\Source\MathEquation\Types.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\Vml.h" />
+    <ClInclude Include="..\Source\DocxFormat\VmlDrawing.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\VmlOfficeDrawing.h" />
+    <ClInclude Include="..\Source\DocxFormat\Logic\VmlWord.h" />
+    <ClInclude Include="..\Source\DocxFormat\Docx.h" />
+    <ClInclude Include="..\Source\DocxFormat\File.h" />
+    <ClInclude Include="..\Source\DocxFormat\FileFactory.h" />
+    <ClInclude Include="..\Source\DocxFormat\FileType.h" />
+    <ClInclude Include="..\Source\DocxFormat\FileTypes.h" />
+    <ClInclude Include="..\Source\DocxFormat\IFileBuilder.h" />
+    <ClInclude Include="..\Source\DocxFormat\IFileContainer.h" />
+    <ClInclude Include="..\Source\DocxFormat\NamespaceOwn.h" />
+    <ClInclude Include="..\Source\DocxFormat\Namespaces.h" />
+    <ClInclude Include="..\Source\DocxFormat\RId.h" />
+    <ClInclude Include="..\Source\DocxFormat\UnknowTypeFile.h" />
+    <ClInclude Include="..\Source\DocxFormat\WritingElement.h" />
+    <ClInclude Include="..\Source\DocxFormat\WritingVector.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Source\Base\unicode_util.cpp" />
-    <ClCompile Include="..\Source\Common\Align.cpp" />
-    <ClCompile Include="..\Source\Common\Color.cpp" />
-    <ClCompile Include="..\Source\Common\Index.cpp" />
-    <ClCompile Include="..\Source\Common\NumFormat.cpp" />
-    <ClCompile Include="..\Source\Common\Position.cpp" />
-    <ClCompile Include="..\Source\Common\SimpleTypes_Word.cpp" />
-    <ClCompile Include="..\Source\Common\Utils.cpp" />
-    <ClCompile Include="..\Source\Common\Wrap.cpp" />
-    <ClCompile Include="..\Source\Common\ZIndex.cpp" />
-    <ClCompile Include="..\Source\DocxFormat\Docx.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingCoreInfo.cpp" />
-    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingEffects.cpp" />
-    <ClCompile Include="..\Source\DocxFormat\FileFactory.cpp">
+    <ClCompile Include="..\Source\DocxFormat\Logic\Table.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\IFileContainer.cpp" />
-    <ClCompile Include="..\Source\DocxFormat\Logic\AlternateContent.cpp">
+    <ClCompile Include="..\Source\DocxFormat\Logic\TableProperty.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\Annotations.cpp" />
-    <ClCompile Include="..\Source\DocxFormat\Logic\Bdo.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\Dir.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\Source\DocxFormat\Logic\FldSimple.cpp">
       <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Docx\Logic\</AssemblerListingLocation>
@@ -458,6 +449,21 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\Dir.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\SmartTag.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\Sdt.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\Source\DocxFormat\Logic\Paragraph.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -478,6 +484,13 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\AlternateContent.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\Bdo.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <ClCompile Include="..\Source\DocxFormat\Logic\RunProperty.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@@ -494,44 +507,34 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
       <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
     </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\Sdt.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
-    </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Logic\Annotations.cpp" />
     <ClCompile Include="..\Source\DocxFormat\Logic\SectionProperty.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\SmartTag.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\Table.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
+    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingCoreInfo.cpp" />
+    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingEffects.cpp" />
+    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingExt.cpp" />
+    <ClCompile Include="..\Source\SystemUtility\FileSystem\Directory.cpp" />
+    <ClCompile Include="..\Source\SystemUtility\FileSystem\File.cpp" />
+    <ClCompile Include="..\Source\SystemUtility\SystemUtility.cpp" />
+    <ClCompile Include="..\Source\Common\Align.cpp" />
+    <ClCompile Include="..\Source\Common\Color.cpp" />
+    <ClCompile Include="..\Source\Common\Index.cpp" />
+    <ClCompile Include="..\Source\Common\NumFormat.cpp" />
+    <ClCompile Include="..\Source\Common\Position.cpp" />
+    <ClCompile Include="..\Source\Common\SimpleTypes_Word.cpp" />
+    <ClCompile Include="..\Source\Common\Utils.cpp" />
+    <ClCompile Include="..\Source\Common\Wrap.cpp" />
+    <ClCompile Include="..\Source\Common\ZIndex.cpp" />
+    <ClCompile Include="..\Source\XlsxFormat\Common.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\TableProperty.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
+    <ClCompile Include="..\Source\XlsxFormat\FileFactory_Spreadsheet.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)Docx\Logic\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\Source\DocxFormat\Logic\Vml.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <ClCompile Include="..\Source\XlsxFormat\IFileContainer_Spreadsheet.cpp" />
+    <ClCompile Include="..\Source\XlsxFormat\Chart\ChartSerialize.cpp" />
     <ClCompile Include="..\Source\DocxFormat\Math\oMath.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -543,28 +546,25 @@
     <ClCompile Include="..\Source\DocxFormat\Math\oMathPara.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <ClCompile Include="..\Source\Base\unicode_util.cpp" />
+    <ClCompile Include="..\Source\XML\stringcommon.cpp" />
     <ClCompile Include="..\Source\MathEquation\MathEquation.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <ClCompile Include="..\Source\SystemUtility\FileSystem\Directory.cpp" />
-    <ClCompile Include="..\Source\SystemUtility\FileSystem\File.cpp" />
-    <ClCompile Include="..\Source\SystemUtility\SystemUtility.cpp" />
-    <ClCompile Include="..\Source\XlsxFormat\Chart\ChartSerialize.cpp" />
-    <ClCompile Include="..\Source\XlsxFormat\Common.cpp">
+    <ClCompile Include="..\Source\DocxFormat\Logic\Vml.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <ClCompile Include="..\Source\XlsxFormat\FileFactory_Spreadsheet.cpp">
+    <ClCompile Include="..\Source\DocxFormat\Docx.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\FileFactory.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
-    <ClCompile Include="..\Source\XlsxFormat\IFileContainer_Spreadsheet.cpp" />
-    <ClCompile Include="..\Source\XML\stringcommon.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Source\XML\libxml2\win_build\libxml2.vcxproj">
-      <Project>{21663823-de45-479b-91d0-b4fef4916ef0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
+    <ClCompile Include="..\Source\DocxFormat\IFileContainer.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Common/DocxFormat/Projects/DocxFormat2005.vcxproj.filters

@@ -2,157 +2,157 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Rels">
-      <UniqueIdentifier>{9f782695-5740-4d0b-b8ed-5e35b72e449e}</UniqueIdentifier>
+      <UniqueIdentifier>{fb61ca71-d240-4c7d-9213-6b40a02821fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="App">
-      <UniqueIdentifier>{6def82be-6f0a-4ac2-8875-dfde054c4f9f}</UniqueIdentifier>
+      <UniqueIdentifier>{e78217ce-0000-4c11-a4c3-4fd19438b461}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core">
-      <UniqueIdentifier>{0d988f22-5697-495f-a497-ccfcdd8289b4}</UniqueIdentifier>
+      <UniqueIdentifier>{65d6b6b5-abea-4dbe-98a8-bef4452b2a5a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Settings">
-      <UniqueIdentifier>{23c379ad-a004-45b8-a224-5f4f35a63f34}</UniqueIdentifier>
+      <UniqueIdentifier>{fa90ebef-1273-45f7-85ef-1ad2f018f669}</UniqueIdentifier>
     </Filter>
     <Filter Include="Settings\WebSettings">
-      <UniqueIdentifier>{198ca2e9-643d-4e9c-ab04-75fcc59d0f0c}</UniqueIdentifier>
+      <UniqueIdentifier>{ee695cc6-c3cf-44cc-878e-6d80907cfada}</UniqueIdentifier>
     </Filter>
     <Filter Include="Settings\DocumentSettings">
-      <UniqueIdentifier>{d95e558b-01d9-4839-a68b-0960c686ca4e}</UniqueIdentifier>
+      <UniqueIdentifier>{92ec6d5f-34d9-449d-8467-877a9bdd0ba8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Theme">
-      <UniqueIdentifier>{e5208831-fdb3-4e85-b52b-3b47d3d63f75}</UniqueIdentifier>
+      <UniqueIdentifier>{10be7ce6-6f2d-4d7a-9fa4-1e43c51eba37}</UniqueIdentifier>
     </Filter>
     <Filter Include="ContentTypes">
-      <UniqueIdentifier>{1b5869a3-76a2-44cb-8bae-c49e2fb2f6b2}</UniqueIdentifier>
+      <UniqueIdentifier>{44bdb22f-c97e-4eb4-8a29-3627ce7093e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Styles">
-      <UniqueIdentifier>{d2d04f3c-ac94-46c5-aadf-7ab664100229}</UniqueIdentifier>
+      <UniqueIdentifier>{04dd16c8-34df-4527-a632-877955f62428}</UniqueIdentifier>
     </Filter>
     <Filter Include="Custom XML">
-      <UniqueIdentifier>{6769a9ab-dff0-4c59-99c3-735b0fda1080}</UniqueIdentifier>
+      <UniqueIdentifier>{370d2ed3-259e-4e8f-9431-352cdbb99dca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic">
-      <UniqueIdentifier>{342efc94-f57a-4e07-aff3-940f24528f54}</UniqueIdentifier>
+      <UniqueIdentifier>{e0539ed5-6b70-4e47-a371-046c5a2b38c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Tables">
-      <UniqueIdentifier>{d08cac75-8666-45a1-9d26-ee03d91f5971}</UniqueIdentifier>
+      <UniqueIdentifier>{2b988694-3d69-4615-b1d5-a975ab7375cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Fields and Hyperlinks">
-      <UniqueIdentifier>{8b7ea98b-f80d-42d2-8238-a73400132c55}</UniqueIdentifier>
+      <UniqueIdentifier>{51352473-c85e-44b2-898a-82ec58de25c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Custom Markup">
-      <UniqueIdentifier>{75d405f4-a7b0-4809-b7cb-c4fe17dfe936}</UniqueIdentifier>
+      <UniqueIdentifier>{35eaa5bd-92ed-4737-a829-c6fc6217be80}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Custom Markup\Sdt">
-      <UniqueIdentifier>{73716d98-82c6-48b2-b5d5-49e84fc4e689}</UniqueIdentifier>
+      <UniqueIdentifier>{08a05d9e-7312-4cd1-891b-2bbaf10a7855}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Paragraph and Runs">
-      <UniqueIdentifier>{7b2ca3af-d661-4d23-a876-a2fb17346d23}</UniqueIdentifier>
+      <UniqueIdentifier>{fd961369-5064-4639-80f2-9f501e06b5e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Paragraph and Runs\Paragraph">
-      <UniqueIdentifier>{c7cb1e19-d05f-44e9-9bbb-3e4344058778}</UniqueIdentifier>
+      <UniqueIdentifier>{f0f6d075-36f1-4227-b39f-500f9335c79f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Paragraph and Runs\Run">
-      <UniqueIdentifier>{5deb2d67-8936-4e8d-a707-038e4b8de3f8}</UniqueIdentifier>
+      <UniqueIdentifier>{b3cb173f-bcf3-4693-b618-a337a1d21a3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Paragraph and Runs\Run\Pict">
-      <UniqueIdentifier>{2663cc5b-4d6a-49f1-a2d0-ddecb7b9658a}</UniqueIdentifier>
+      <UniqueIdentifier>{71ff7555-68aa-4e7b-8692-d99c0d651f4a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Annotations">
-      <UniqueIdentifier>{adb03a57-c2a7-4f22-9748-25fb5b68a0ec}</UniqueIdentifier>
+      <UniqueIdentifier>{bf2d2c96-2cf6-4123-93ba-356d760ada73}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Drawing">
-      <UniqueIdentifier>{7c84540e-57ca-4e30-a159-ac41db9a3435}</UniqueIdentifier>
+      <UniqueIdentifier>{1c71004d-28f5-4749-8fdb-8658ea02b3c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Logic\Sections">
-      <UniqueIdentifier>{52f5e22d-0acd-4a5d-a7ee-0536be8578d1}</UniqueIdentifier>
+      <UniqueIdentifier>{158fd0b2-46b1-4d00-940f-c1b437bbeb84}</UniqueIdentifier>
     </Filter>
     <Filter Include="Numbering">
-      <UniqueIdentifier>{38578999-598b-4865-96f7-4ebc2735f5d7}</UniqueIdentifier>
+      <UniqueIdentifier>{966e1451-7b61-4afb-bcbe-759139845a11}</UniqueIdentifier>
     </Filter>
     <Filter Include="Bibliography">
-      <UniqueIdentifier>{c57cd404-27d7-427c-9012-89837e6a8799}</UniqueIdentifier>
+      <UniqueIdentifier>{ffce8b7a-ecba-43bf-b649-ba94c5a4c510}</UniqueIdentifier>
     </Filter>
     <Filter Include="Footnotes and Endnotes">
-      <UniqueIdentifier>{b348ec7c-3d62-4d87-a797-078bd316173d}</UniqueIdentifier>
+      <UniqueIdentifier>{b7d00ae2-b175-4ce2-889a-9f31b59d5a3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Headers and Footers">
-      <UniqueIdentifier>{d1762c5a-135e-4e85-8623-f5414729487b}</UniqueIdentifier>
+      <UniqueIdentifier>{43bb2f4f-4c2c-44f7-bf8e-65c76649d2c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Fonts">
-      <UniqueIdentifier>{e4dbb546-7041-4d89-879f-c26ddac4f3ff}</UniqueIdentifier>
+      <UniqueIdentifier>{c9330b22-a8be-41d2-b926-38912a687870}</UniqueIdentifier>
     </Filter>
     <Filter Include="Media">
-      <UniqueIdentifier>{d8cf81fb-08b3-4f76-8fce-4252ef52561f}</UniqueIdentifier>
+      <UniqueIdentifier>{3834f170-22f7-4393-9821-b49591edd3c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="External">
-      <UniqueIdentifier>{f23d32f6-3fdc-47f0-819a-e157e99a006c}</UniqueIdentifier>
+      <UniqueIdentifier>{714ab9a0-306e-40ce-880f-53968b714b2c}</UniqueIdentifier>
     </Filter>
     <Filter Include="DrawingML">
-      <UniqueIdentifier>{2e386f0b-41e6-4bf1-8141-1f8ee78c42a5}</UniqueIdentifier>
+      <UniqueIdentifier>{74e3f7c6-c74c-4a55-b54a-b6ad038f2c8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Utility">
-      <UniqueIdentifier>{8127c09a-b209-4278-82fd-3892ede18be1}</UniqueIdentifier>
+      <UniqueIdentifier>{aebb09e8-1793-4f30-9342-6e5aaded3d03}</UniqueIdentifier>
     </Filter>
     <Filter Include="Utility\FileSys">
-      <UniqueIdentifier>{e4529119-fdce-43e8-ab0d-17b915ac972a}</UniqueIdentifier>
+      <UniqueIdentifier>{c7b9f40e-e21e-4d6c-8ec9-4809271910be}</UniqueIdentifier>
     </Filter>
     <Filter Include="Common">
-      <UniqueIdentifier>{70db2b18-f4d6-4e3d-a700-9d1b067b3b47}</UniqueIdentifier>
+      <UniqueIdentifier>{5ff0f359-7544-4e65-8ec4-9854efc45c49}</UniqueIdentifier>
     </Filter>
     <Filter Include="Comments">
-      <UniqueIdentifier>{123d0f57-ae78-4c79-ac95-5bad8a652c05}</UniqueIdentifier>
+      <UniqueIdentifier>{a2e5dda3-967c-463b-82d7-3dc6c4b0cd76}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat">
-      <UniqueIdentifier>{c59dff16-5b44-41e7-9e9b-03ed45059ec9}</UniqueIdentifier>
+      <UniqueIdentifier>{707a763c-1da3-4b38-a1a4-c8c699ae7fd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\CalcChain">
-      <UniqueIdentifier>{cde57b60-d9f8-4f10-8a31-8f9fb8440a87}</UniqueIdentifier>
+      <UniqueIdentifier>{1fe1f31f-82ce-437e-8e46-62cfb01a5b48}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Chart">
-      <UniqueIdentifier>{c1cda87b-ffab-4f13-b904-d0994423d20d}</UniqueIdentifier>
+      <UniqueIdentifier>{5857506b-5f19-4ed2-bef3-fe3ab4b8b871}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Comments">
-      <UniqueIdentifier>{bf4bdc5f-bf4b-4be0-8fac-e9a517af7cd5}</UniqueIdentifier>
+      <UniqueIdentifier>{e6faab74-8d8d-47fc-8e87-0133a872c4d7}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Drawing">
-      <UniqueIdentifier>{3ae69e64-983a-44de-b1b6-7596cba7a751}</UniqueIdentifier>
+      <UniqueIdentifier>{2865bf5a-0b47-4575-a294-f97ca9ba8a74}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\SharedStrings">
-      <UniqueIdentifier>{74b156a0-0b51-49e0-be9c-72183c399a97}</UniqueIdentifier>
+      <UniqueIdentifier>{59dee908-a36c-407f-ac8a-4e937f05d708}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Styles">
-      <UniqueIdentifier>{6cbef400-5de6-44d8-a9a1-0aa5ee63253b}</UniqueIdentifier>
+      <UniqueIdentifier>{1981ecf4-578a-4889-b713-11c73d25d94f}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Table">
-      <UniqueIdentifier>{b0ec8060-4803-41b4-9619-03b0e18f89f3}</UniqueIdentifier>
+      <UniqueIdentifier>{1f6c9b65-49c9-449f-8080-8cf61188cbd4}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Workbook">
-      <UniqueIdentifier>{250870a1-2de9-4bac-9d91-f8c6c564b8b3}</UniqueIdentifier>
+      <UniqueIdentifier>{489c7e65-b842-4f8c-8f05-04c7d12bc7d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\Worksheets">
-      <UniqueIdentifier>{3187bb9b-0b31-4a28-9a41-16758007f912}</UniqueIdentifier>
+      <UniqueIdentifier>{7790209b-a48d-466b-8850-829820d652f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="XlsxFormat\ExternalLinks">
-      <UniqueIdentifier>{6a21f408-4f51-4389-b788-1e08f9f68f85}</UniqueIdentifier>
+      <UniqueIdentifier>{693d6296-2cae-45ff-a385-5da702ce1d4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Math">
-      <UniqueIdentifier>{33d3e906-0b7e-4c5b-bb32-13711514dfb1}</UniqueIdentifier>
+      <UniqueIdentifier>{9999c61d-3b82-4f3d-bcaa-b201e49a8a63}</UniqueIdentifier>
     </Filter>
     <Filter Include="DiagramML">
-      <UniqueIdentifier>{d20bb33a-9694-473c-a1ff-c1252ab1d05e}</UniqueIdentifier>
+      <UniqueIdentifier>{b39b48bd-5471-44c1-a963-571b9e4d0b8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Base">
-      <UniqueIdentifier>{d1065eab-cc66-41c9-a0de-9f7e41a6947f}</UniqueIdentifier>
+      <UniqueIdentifier>{c900b10f-ac04-4c12-ae93-6b81bd1c1fda}</UniqueIdentifier>
     </Filter>
     <Filter Include="XML">
-      <UniqueIdentifier>{9719900a-ae34-4756-aa5f-efdf6e03e8ed}</UniqueIdentifier>
+      <UniqueIdentifier>{c30fe263-8bdb-4c0e-8b22-4eaef569d9a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Equation">
-      <UniqueIdentifier>{fae869e7-f027-4890-b886-6a5ed06239aa}</UniqueIdentifier>
+      <UniqueIdentifier>{36c19e9b-f30c-4a6d-9bcc-43f958a63a3d}</UniqueIdentifier>
     </Filter>
     <Filter Include="VectorML">
-      <UniqueIdentifier>{7b7224bf-c9d9-4de9-bcab-1dfe744d617e}</UniqueIdentifier>
+      <UniqueIdentifier>{9c0ad51f-4bd2-4fa5-8baf-6d40d35040db}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -738,6 +738,9 @@
     <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingEffects.cpp">
       <Filter>DrawingML</Filter>
     </ClCompile>
+    <ClCompile Include="..\Source\DocxFormat\Drawing\DrawingExt.cpp">
+      <Filter>DrawingML</Filter>
+    </ClCompile>
     <ClCompile Include="..\Source\SystemUtility\FileSystem\Directory.cpp">
       <Filter>Utility\FileSys</Filter>
     </ClCompile>

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

@@ -44,6 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)../XML/include";"$(ProjectDir)../XML/include/libxml";"$(ProjectDir)/support""
+				PreprocessorDefinitions="_MSC_VER=1400"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

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

@@ -65,11 +65,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\include;D:\WORK\boost\1_60_0;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\XML\include;C:\__Work\core\Common\3dParty\curl\include;C:\__Work\core\DesktopEditor\freetype-2.5.2\include;C:\__Work\core\UnicodeConverter\icubuilds\win_32\include;C:\__Work\core\Common\DocxFormat\Source\XML\libxml2\win_build;$(IncludePath)</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);C:\Program Files %28x86%29\Microsoft Visual Studio 9.0\VC\atlmfc\lib;D:\WORK\boost\1_60_0\stage\lib\i386;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
@@ -86,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;$(ProjectDir)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,7 +120,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)../XML/include;$(ProjectDir)../XML/include/libxml;$(ProjectDir)/support;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>

DesktopEditor/cximage/CxImage/cximage_vs2005.vcproj

@@ -504,8 +504,8 @@
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/CxImage/ximacfg.h

@@ -16,7 +16,7 @@
 
 #define CXIMAGE_SUPPORT_DECODE	1
 #define CXIMAGE_SUPPORT_ENCODE	1		//<vho><T.Peck>
-#define	CXIMAGE_SUPPORT_WINDOWS 1
+//#define	CXIMAGE_SUPPORT_WINDOWS 1
 #define	CXIMAGE_SUPPORT_EXIF    1
 
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@
 #define CXIMAGE_SUPPORT_TGA 1
 #define CXIMAGE_SUPPORT_PCX 1
 #define CXIMAGE_SUPPORT_WBMP 1
-#define CXIMAGE_SUPPORT_WMF 1
+#define CXIMAGE_SUPPORT_WMF 0
 
 #define CXIMAGE_SUPPORT_JP2 1
 #define CXIMAGE_SUPPORT_JPC 1

DesktopEditor/cximage/jasper/jasper_vs2005.vcproj

@@ -50,11 +50,11 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/jasper.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
-				WarningLevel="2"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
 			/>

DesktopEditor/cximage/jbig/jbig_vs2005.vcproj

@@ -344,10 +344,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/jbig.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj

@@ -339,10 +339,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/Jpeg.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/libpsd/libpsd_vs2005.vcproj

@@ -345,10 +345,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/libpsd.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/mng/mng_vs2005.vcproj

@@ -50,10 +50,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/mng.pch"
-				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/png/png_vs2005.vcproj

@@ -52,8 +52,8 @@
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/raw/libdcr_vs2005.vcproj

@@ -196,10 +196,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/libdcr.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj

@@ -51,10 +51,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/Tiff.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/cximage/tiff/tif_config.h

-/* Define to 1 if you have the <assert.h> header file. */
+
+/* Define to 1 if you have the <assert.h> header file. */
 #define HAVE_ASSERT_H 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
@@ -62,11 +63,11 @@
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-# ifndef inline
-#  define inline __inline
-# endif
-#endif
+//#ifndef __cplusplus
+//# ifndef inline
+//#  define inline __inline
+//# endif
+//#endif
 
 #ifndef _LINUX
 #define lfind _lfind

DesktopEditor/fontengine/font_engine_vs2005.vcproj

@@ -201,8 +201,8 @@
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

DesktopEditor/freetype-2.5.2/builds/windows/vc2005/freetype.vcproj

@@ -502,11 +502,11 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				DisableLanguageExtensions="true"
-				PrecompiledHeaderFile=".\..\..\..\objs\debug/freetype.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)/"
-				ObjectFile="$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(ConfigurationName)/"
-				WarningLevel="4"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
+				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
 			/>

DesktopEditor/graphics/graphics_vs2005.vcproj

@@ -219,8 +219,8 @@
 				DisableLanguageExtensions="false"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				BrowseInformation="0"
 				WarningLevel="3"
 				SuppressStartupBanner="true"

DesktopEditor/raster/JBig2/win32/jbig2.vcproj

@@ -48,6 +48,8 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"

DesktopEditor/raster/raster_vs2005.vcproj

@@ -496,10 +496,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\Debug/raster.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
-				ObjectFile="$(ConfigurationName)\"
-				ProgramDataBaseFileName="$(ConfigurationName)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"

OfficeUtils/win32/OfficeUtilsLib.vcproj

@@ -82,12 +82,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -103,11 +102,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\src\zlib-1.2\&quot;;&quot;..\src\zlib-1.2.3\contrib\minizip\&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -142,11 +146,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -162,16 +167,11 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\src\zlib-1.2\&quot;;&quot;..\src\zlib-1.2.3\contrib\minizip\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"

X2tConverter/test/win32Test/X2tTest.vcproj

@@ -43,6 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="&quot;../../../DesktopEditor/agg-2.4/include&quot;;&quot;C:\__Work\core\DesktopEditor\agg-2.4\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;__WORDSIZE=32;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"