(1.0.1.110): ASCOfficeOdtFile

проект теперь стал ПОЛНОСТЬЮ независимым от исходников других библиотек в других местах 

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

ASCOfficeOdtFile/ASCOfficeOdtFile2005.sln

@@ -31,35 +31,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdtFormat", "Projects\OdtFo
 		{399893AA-3617-4CD8-A980-7F15CDAFA3D2} = {399893AA-3617-4CD8-A980-7F15CDAFA3D2}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\ASCDocxFormat\Projects\Common2005.vcproj", "{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFileTest", "ASCOfficeOdtFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{C1587C15-6268-4451-9263-937E63A945F6} = {C1587C15-6268-4451-9263-937E63A945F6}
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFileTest", "ASCOfficeOdtFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Projects\XML2005.vcproj", "{C1587C15-6268-4451-9263-937E63A945F6}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Projects\XML2005.vcproj", "{C1587C15-6268-4451-9263-937E63A945F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "Projects\Utility2005.vcproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "Projects\Utility2005.vcproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Projects\Common2005.vcproj", "{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
@@ -69,57 +65,40 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
-		ReleaseASC|Win32 = ReleaseASC|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.Debug|Win32.ActiveCfg = Debug|Win32
 		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.Debug|Win32.Build.0 = Debug|Win32
 		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.Release|Win32.ActiveCfg = Release|Win32
 		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.Release|Win32.Build.0 = Release|Win32
-		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
 		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.Debug|Win32.Build.0 = Debug|Win32
 		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.Release|Win32.ActiveCfg = Release|Win32
 		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.Release|Win32.Build.0 = Release|Win32
-		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{D2DDCD21-4AF0-4194-BA72-2AAF1DDD11A3}.ReleaseASC|Win32.Build.0 = Release|Win32
 		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.Debug|Win32.Build.0 = Debug|Win32
 		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.Release|Win32.ActiveCfg = Release|Win32
 		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.Release|Win32.Build.0 = Release|Win32
-		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{4F34ADFD-D168-420C-A497-7EF74155EFBE}.ReleaseASC|Win32.Build.0 = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.Build.0 = Debug|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.ActiveCfg = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.Build.0 = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.ReleaseASC|Win32.Build.0 = Release|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
 		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.ReleaseASC|Win32.Build.0 = Release|Win32
 		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C1587C15-6268-4451-9263-937E63A945F6}.Debug|Win32.Build.0 = Debug|Win32
 		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Win32.ActiveCfg = Release|Win32
 		{C1587C15-6268-4451-9263-937E63A945F6}.Release|Win32.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|Win32.ActiveCfg = Debug|Win32
 		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.Debug|Win32.Build.0 = Debug|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|Win32.ActiveCfg = Release|Win32
-		{7B9F3647-32D3-4F82-8CA5-A43E490E1457}.ReleaseASC|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Debug|Win32.Build.0 = Debug|Win32
+		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.ActiveCfg = Release|Win32
+		{399893AA-3617-4CD8-A980-7F15CDAFA3D2}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ASCOfficeOdtFile/ASCOfficeOdtFile2005.vcproj

@@ -51,7 +51,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common;.\Source\DocxFormat;Source;Source\OdtFormat"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				IgnoreDefaultLibraryNames="LIBC.lib"
 				MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -152,7 +152,7 @@
 				Name="VCCLCompilerTool"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\..\Common;.\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common;.\Source\DocxFormat;Source;Source\OdtFormat"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -179,7 +179,7 @@
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				IgnoreDefaultLibraryNames="LIBC.lib"
 				MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration

ASCOfficeOdtFile/OdtFile.cpp

@@ -20,11 +20,11 @@
 
 #include "Resource.h"
 
-#ifdef _DEBUG
-	#pragma comment(lib, "../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Debug/OfficeSvmFile.lib")
-#else
-	#pragma comment(lib, "../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Release/OfficeSvmFile.lib")
-#endif
+//#ifdef _DEBUG
+//	#pragma comment(lib, "../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Debug/OfficeSvmFile.lib")
+//#else
+//	#pragma comment(lib, "../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Release/OfficeSvmFile.lib")
+//#endif
 
 
 #import "../Redist/ASCOfficeOdfFile.dll" rename_namespace("ASCOfficeOdfFile"), raw_interfaces_only
@@ -32,7 +32,10 @@
 // :     1   ,      xlsx  docx
 //               0   ,          package
 #ifndef STANDALONE_USE
-	#define STANDALONE_USE 1//    :  (1)   (0)
+	#define STANDALONE_USE 0//    :  (1)   (0)
+#else
+	#undef STANDALONE_USE
+	#define STANDALONE_USE 0
 #endif
 
 namespace {

ASCOfficeOdtFile/Projects/Common.vcproj

+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Common"
+	ProjectGUID="{873D625C-37E4-47C4-8120-2D9FC6A98765}"
+	RootNamespace="Common"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\Lib\Debug"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\Lib\Release"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\Source\Common\AbstractConverter.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Point.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Size.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

ASCOfficeOdtFile/Projects/Common2005.vcproj

+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="Common"
+	ProjectGUID="{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
+	RootNamespace="Common"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\Lib\Debug"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompiled_common.h"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\Lib\Release"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompiled_common.h"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\Source\Common\AbstractConverter.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Point.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\precompiled_common.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\precompiled_common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Size.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

ASCOfficeOdtFile/Projects/Docx2Odt.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\..\Common\AvsDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat"
+				AdditionalIncludeDirectories=".\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;.\Source\DocxFormat;.\..\Source\OdtFormat"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -102,7 +102,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\..\Common\AvsDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat"
+				AdditionalIncludeDirectories=".\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;.\..\Source\DocxFormat;.\..\Source\OdtFormat"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"

ASCOfficeOdtFile/Projects/Odt2Docx2005.vcproj

@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\Source/OdtFormat;.\..\..\Common\AvsDocxFormat\Source\DocxFormat"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common;.\Source\OdtFormat;.\Source\DocxFormat"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -101,7 +101,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\Source/OdtFormat;.\..\..\Common\AvsDocxFormat\Source\DocxFormat"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common;.\Source\OdtFormat;.\Source\DocxFormat"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"

ASCOfficeOdtFile/Projects/OdtFormat.vcproj

@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -103,7 +103,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common"
+				AdditionalIncludeDirectories=".\Source\Utility;.\Source\XML;.\Source\Common"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"

ASCOfficeOdtFile/Source/DocxFormat/Media/Image.cpp

@@ -37,11 +37,12 @@ namespace OOX
 		boost::replace_all(newFilename, L" ", L"_");
 		if (boost::filesystem::exists(m_filename) && !boost::filesystem::exists(newFilePath/newFilename))	
 		{
-/*			if (m_filename.extension() == L".svm")
-			{
-				ConvertSvmToImage(m_filename, replace_extension(newFilePath/newFilename, L"png"));
-			}
-			else */if (m_filename.extension() != L"")
+			//if (m_filename.extension() == L".svm")
+			//{
+			//	ConvertSvmToImage(m_filename, replace_extension(newFilePath/newFilename, L"png"));
+			//}
+			//else 
+			if (m_filename.extension() != L"")
 			{
 				boost::filesystem::copy_file(m_filename, newFilePath/newFilename);
 			}
@@ -53,7 +54,7 @@ namespace OOX
 		}
 		//if (m_filename.extension() == L".svm")
 		//	content.Default->add(replace_extension(newFilePath/newFilename, L"png"));
-		//else
+		//else	
 			content.Default->add(newFilePath/newFilename);
 	}
 

ASCOfficeOdtFile/Source/OdtFormat/Folder.h

@@ -3,7 +3,7 @@
 #define ODT_FOLDER_INCLUDE_H_
 
 #include <string>
-#include "../../../Common/ASCDocxFormat/Source/Utility/property.h"
+#include "../../Source/Utility/property.h"
 #include "Manifest/File.h"
 #include "Settings/File.h"
 #include "Meta/File.h"

ASCOfficeOdtFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//107
-#define INTVER 1,0,1,107
-#define STRVER "1,0,1,107\0"
+//110
+#define INTVER 1,0,1,110
+#define STRVER "1,0,1,110\0"