fix VS2012

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

fix VS2012
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63032 954022d7-b5bf-4e40-9824-e11837661b57
c55c668e · Alexey.Musinov · Alexander Trofimov · 4cda1045 · c55c668e · c55c668e
Commit c55c668e authored Jun 15, 2015 by Alexey.Musinov Committed by Alexander Trofimov May 21, 2016
3 changed files
--- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj
+++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C5371405-338F-4B70-83BD-2A5CDF64F383}</ProjectGuid>
+    <RootNamespace>DocFormatLib</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include\libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader />
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Common\3dParty\pole\pole.h" />
+    <ClInclude Include="..\..\Common\Aggregat.h" />
+    <ClInclude Include="..\..\Common\Callback.h" />
+    <ClInclude Include="..\..\Common\FormatUtils.h" />
+    <ClInclude Include="..\..\Common\IOperand.h" />
+    <ClInclude Include="..\..\Common\IVirtualConstructor.h" />
+    <ClInclude Include="..\..\Common\LanguageCodes.h" />
+    <ClInclude Include="..\..\Common\MD4\global.h" />
+    <ClInclude Include="..\..\Common\MD4\md4.h" />
+    <ClInclude Include="..\..\Common\MD4\md4c.h" />
+    <ClInclude Include="..\..\Common\Singleton.h" />
+    <ClInclude Include="..\..\Common\SPRMCodes.h" />
+    <ClInclude Include="..\..\Common\TargetOptions.h" />
+    <ClInclude Include="..\..\Common\TextMark.h" />
+    <ClInclude Include="..\..\Common\utf8.h" />
+    <ClInclude Include="..\..\Common\XmlTools.h" />
+    <ClInclude Include="..\..\DocDocxConverter\AbstractOpenXmlMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\AnnotationOwnerList.h" />
+    <ClInclude Include="..\..\DocDocxConverter\AnnotationReferenceDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\AutoSummaryInfo.h" />
+    <ClInclude Include="..\..\DocDocxConverter\BookmarkFirst.h" />
+    <ClInclude Include="..\..\DocDocxConverter\BorderCode.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ByteStructure.h" />
+    <ClInclude Include="..\..\DocDocxConverter\CharacterPropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\CharacterPropertyExceptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\CharacterRange.h" />
+    <ClInclude Include="..\..\DocDocxConverter\CommentsMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ContentTypes.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ConversionContext.h" />
+    <ClInclude Include="..\..\DocDocxConverter\Converter.h" />
+    <ClInclude Include="..\..\DocDocxConverter\DateAndTime.h" />
+    <ClInclude Include="..\..\DocDocxConverter\DocumentMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\DocumentProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\DocumentTypographyInfo.h" />
+    <ClInclude Include="..\..\DocDocxConverter\DrawingObjectGrid.h" />
+    <ClInclude Include="..\..\DocDocxConverter\EmuValue.h" />
+    <ClInclude Include="..\..\DocDocxConverter\EndnoteDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\EndnotesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FieldCharacter.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FileInformationBlock.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FixedPointNumber.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FontFamilyName.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FontTableMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FooterMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FootnoteDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FootnotesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FormattedDiskPage.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FormattedDiskPageCHPX.h" />
+    <ClInclude Include="..\..\DocDocxConverter\FormattedDiskPagePAPX.h" />
+    <ClInclude Include="..\..\DocDocxConverter\Global.h" />
+    <ClInclude Include="..\..\DocDocxConverter\HeaderAndFooterTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\HeaderMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\IBinaryReader.h" />
+    <ClInclude Include="..\..\DocDocxConverter\IMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\IVisitable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\LanguageId.h" />
+    <ClInclude Include="..\..\DocDocxConverter\LanguageIdMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\LineSpacingDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListData.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListFormatOverride.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListFormatOverrideLevel.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListFormatOverrideTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListLevel.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ListTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\MainDocumentMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\MemoryStream.h" />
+    <ClInclude Include="..\..\DocDocxConverter\NumberingMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeArtContent.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\BitmapBlip.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\BlipStoreContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\BlipStoreEntry.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ChildAnchor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ClientAnchor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ClientData.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\DiagramBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\DrawingContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\DrawingGroup.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\DrawingGroupRecord.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\DrawingRecord.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\FillStyleBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\GeometryBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\GeometryTextBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\GroupContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\GroupShapeBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\GroupShapeRecord.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\LineStyleBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\MetafilePictBlip.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\OfficeArtClientTextbox.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\PathParser.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\PathSegment.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ProtectionBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Record.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\RecordFactory.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\RegularContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ShadowStyleBooleanProperties.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shape.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ShapeContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ShapeOptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ShapeType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\ShapeTypeFactory.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\ArcType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\ArrowType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\BevelType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\BlockArcType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\BracketsType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\CalloutsType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\CanType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\Connector.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\CubeType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\DiamondType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\DonutType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\FlowChartType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\FoldedCornerlType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\HeartType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\HexagonType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\IsoscelesTriangleType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\LightningBoltType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\LineType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\MoonType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\NoSmokingType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\OctagonType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\OvalType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\ParallelogramType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\PentagonType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\PictureFrameType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\PlaqueType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\PlusType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\RectangleType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\RightTriangleType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\RoundedRectangleType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\SmileyFaceType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\StarType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\SunType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\TextboxType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\TrapezoidType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\SplitMenuColorContainer.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\UnknownRecord.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OleObject.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OleObjectMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OpenXmlPackage.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ParagraphHeight.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ParagraphPropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ParagraphPropertyExceptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\PictureDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\PieceDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\PieceTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\Plex.h" />
+    <ClInclude Include="..\..\DocDocxConverter\PropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\PropertyExceptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\RevisionData.h" />
+    <ClInclude Include="..\..\DocDocxConverter\RGBColor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SectionDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SectionPropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SectionPropertyExceptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SettingsMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\ShadingDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SinglePropertyModifier.h" />
+    <ClInclude Include="..\..\DocDocxConverter\Spa.h" />
+    <ClInclude Include="..\..\DocDocxConverter\SprmTDefTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StringTable.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StructuredStorageReader.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StyleSheet.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StyleSheetDescription.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StyleSheetInformation.h" />
+    <ClInclude Include="..\..\DocDocxConverter\StyleSheetMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TabDescriptor.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TableCellPropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TableInfo.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TableMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TablePropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TablePropertyExceptions.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TableRowPropertiesMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\Tbkd.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TextboxMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\TwipsValue.h" />
+    <ClInclude Include="..\..\DocDocxConverter\VirtualStreamReader.h" />
+    <ClInclude Include="..\..\DocDocxConverter\VMLPictureMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\VMLShapeMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\VMLShapeTypeMapping.h" />
+    <ClInclude Include="..\..\DocDocxConverter\WideString.h" />
+    <ClInclude Include="..\..\DocDocxConverter\WordDocument.h" />
+    <ClInclude Include="..\..\DocDocxConverter\WordprocessingDocument.h" />
+    <ClInclude Include="..\DocFormatLib.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Common\3dParty\pole\pole.cpp" />
+    <ClCompile Include="..\..\Common\MD4\md4c.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\AnnotationReferenceDescriptor.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\CharacterPropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\Converter.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\DocumentMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\DocumentProperties.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\FontFamilyName.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\FontTableMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\FooterMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\FormattedDiskPageCHPX.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\FormattedDiskPagePAPX.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\HeaderAndFooterTable.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\HeaderMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\LanguageIdMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ListData.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ListLevel.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ListTable.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\MainDocumentMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\NumberingMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\OfficeDrawing\Record.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\OfficeDrawing\RecordFactory.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\OfficeDrawing\ShapeTypeFactory.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\OpenXmlPackage.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ParagraphHeight.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ParagraphPropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\ParagraphPropertyExceptions.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\PictureDescriptor.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\PieceTable.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\PropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\PropertyExceptions.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\RevisionData.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\SectionPropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\SettingsMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\SinglePropertyModifier.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\StyleSheet.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\StyleSheetDescription.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\StyleSheetInformation.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\StyleSheetMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\TableCellPropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\TableMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\TablePropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\TableRowPropertiesMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\TextboxMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\VMLPictureMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\VMLShapeMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\VMLShapeTypeMapping.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\WordDocument.cpp" />
+    <ClCompile Include="..\..\DocDocxConverter\WordprocessingDocument.cpp" />
+    <ClCompile Include="..\DocFormatLib.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj">
+      <Project>{3f3cb5a1-bb01-49c1-9342-4a69e30f9ef6}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj">
+      <Project>{a100103a-353e-45e8-a9b8-90b87cc5c0b0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\DesktopEditor\graphics\graphics_vs2005.vcxproj">
+      <Project>{37ca072a-5bde-498b-b3a7-5e404f5f9bf2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
--- a/ASCOfficeDocFile/Win32/OfficeDocFile_VS2012.sln
+++ b/ASCOfficeDocFile/Win32/OfficeDocFile_VS2012.sln
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocFile", "ASCOfficeDocFile2012.vcxproj", "{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}"
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocFile", "ASCOfficeDocFile2005.vcxproj", "{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\ASCDocxFormat\Projects\Common2012.vcxproj", "{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcxproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
+	ProjectSection(ProjectDependencies) = postProject
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\ASCDocxFormat\Projects\DocxFormat2012.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\ASCDocxFormat\Projects\XML2012.vcxproj", "{C1587C15-6268-4451-9263-937E63A945F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcxproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\ASCDocxFormat\Projects\Utility2012.vcxproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcxproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocFileTest_VS2012", "Tests\DocFileTest\DocFileTest_VS2012.csproj", "{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "..\..\Test\Applications\DocxFormatTests\DocFormatTest\win32\DocFormatTest.vcxproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
-	ProjectSection(ProjectDependencies) = postProject
+EndProject
-		{C1587C15-6268-4451-9263-937E63A945F6} = {C1587C15-6268-4451-9263-937E63A945F6}
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+EndProject
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2} = {399893AA-3617-4CD8-A980-7F15CDAFA3D2}
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320} = {DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
-		ReleaseASC|Any CPU = ReleaseASC|Any CPU
+		Release|x64 = Release|x64
-		ReleaseASC|Mixed Platforms = ReleaseASC|Mixed Platforms
-		ReleaseASC|Win32 = ReleaseASC|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -38,91 +39,113 @@ Global
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Win32.Build.0 = Debug|Win32
+		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|x64.ActiveCfg = Debug|x64
+		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|x64.Build.0 = Debug|x64
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Any CPU.ActiveCfg = Release|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Win32.ActiveCfg = Release|Win32
 		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Win32.Build.0 = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.ReleaseASC|Any CPU.ActiveCfg = ReleaseASC|Win32
+		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|x64.ActiveCfg = Release|x64
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.ReleaseASC|Mixed Platforms.ActiveCfg = ReleaseASC|Win32
+		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|x64.Build.0 = Release|x64
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.ReleaseASC|Mixed Platforms.Build.0 = ReleaseASC|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Win32.ActiveCfg = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Win32.Build.0 = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.ActiveCfg = Debug|x64
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.Build.0 = Debug|x64
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Any CPU.ActiveCfg = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Any CPU.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Win32.ActiveCfg = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Win32.Build.0 = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.Build.0 = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.ActiveCfg = Release|x64
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Any CPU.ActiveCfg = Release|Win32
+		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.Build.0 = Release|x64
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Mixed Platforms.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Win32.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Any CPU.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Any CPU.ActiveCfg = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Any CPU.ActiveCfg = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.Build.0 = Debug|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.ActiveCfg = Debug|x64
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.Build.0 = Debug|x64
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Any CPU.ActiveCfg = Release|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.ActiveCfg = Release|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.Build.0 = Release|Win32
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.ActiveCfg = Release|x64
+		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.Build.0 = Release|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Any CPU.ActiveCfg = Release|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Mixed Platforms.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
-		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
-		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Win32.Build.0 = Debug|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Any CPU.ActiveCfg = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Any CPU.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Win32.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Win32.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|x64
-		{C1587C15-6268-4451-9263-937E63A945F6}.ReleaseASC|Any CPU.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
-		{C1587C15-6268-4451-9263-937E63A945F6}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.ReleaseASC|Mixed Platforms.Build.0 = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{C1587C15-6268-4451-9263-937E63A945F6}.ReleaseASC|Win32.Build.0 = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Win32.Build.0 = Debug|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Release|Any CPU.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Release|Win32.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Release|Win32.Build.0 = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Any CPU.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Mixed Platforms.Build.0 = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Win32.Build.0 = Release|Win32
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.ReleaseASC|Any CPU.ActiveCfg = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.ReleaseASC|Any CPU.Build.0 = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.ReleaseASC|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.ReleaseASC|Mixed Platforms.Build.0 = Release|Any CPU
-		{A18419D0-589A-4D6F-932D-A5F2DC0C3DF5}.ReleaseASC|Win32.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/Common/DocxFormat/Source/XML/libxml2/win_build/libxml2.vcproj
+++ b/Common/DocxFormat/Source/XML/libxml2/win_build/libxml2.vcproj
@@ -170,7 +170,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)../XML/include&quot;;&quot;$(ProjectDir)../XML/include/libxml&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)../XML/include&quot;;&quot;$(ProjectDir)../XML/include/libxml&quot;;&quot;$(ProjectDir)/support&quot;"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"