git-svn-id:...

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

ASCImageStudio3/ASCGraphics/OfficeSvmFile/SvmConverter.h

 #ifndef SVM_COVERTER
 #define SVM_COVERTER
 
-#include <boost_filesystem_version.h>
+#include "../../../Common/boost_filesystem_version.h"
 
 void ConvertSvmToImage( const boost::filesystem::wpath & oSource, const boost::filesystem::wpath & oDestination );
 

ASCOfficeDocFile/ASCOfficeDocFile/ASCDocFile.cpp

 #include "stdafx.h"
-#include "AVSDocFile.h"
+#include "ASCDocFile.h"
 
 #ifdef _DEBUG
 #define _CRTDBG_MAP_ALLOC

ASCOfficeDocFile/ASCOfficeDocFile/ASCOfficeDocFile.cpp

-// AVSDocFile.cpp : Implementation of DLL Exports.
+// ASCDocFile.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -7,9 +7,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{35C0955D-A67D-4517-B670-5826ED38343D}", 
-		 name = "AVSDocFile", 
-		 helpstring = "AVSOfficeDocFile 1.0 Type Library",
-		 resource_name = "IDR_AVSDOCFILE") ]
+		 name = "ASCDocFile", 
+		 helpstring = "ASCOfficeDocFile 1.0 Type Library",
+		 resource_name = "IDR_ASCDOCFILE") ]
 class CAVSDocFileModule
 {
 public:

ASCOfficeDocFile/ASCOfficeDocFile/ASCOfficeDocFile.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeDocFile"
-#include "../../../../Common/FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -108,7 +108,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSDOCFILE          REGISTRY                "AVSOfficeDocFile.rgs"
+IDR_ASCDOCFILE          REGISTRY                "ASCOfficeDocFile.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -117,7 +117,7 @@ IDR_AVSDOCFILE          REGISTRY                "AVSOfficeDocFile.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSOfficeDocFile"
+    IDS_PROJNAME            "ASCOfficeDocFile"
 END
 
 #endif    // English (U.S.) resources

ASCOfficeDocFile/ASCOfficeDocFile/ASCOfficeDocFile.rgs

@@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSOfficeDocFile'
-		'AVSOfficeDocFile.DLL'
+		'%APPID%' = s 'ASCOfficeDocFile'
+		'ASCOfficeDocFile.DLL'
 		{
 			val AppID = s '%APPID%'
 		}

ASCOfficeDocFile/ASCOfficeDocFile/ASCOfficeDocFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="AVSOfficeDocFile"
+	Name="ASCOfficeDocFile"
 	ProjectGUID="{962F1E1F-A94C-453F-B244-26D25FFD99A2}"
-	RootNamespace="AVSOfficeDocFile"
+	RootNamespace="ASCOfficeDocFile"
 	Keyword="AtlProj"
 	TargetFrameworkVersion="196613"
 	>
@@ -43,16 +43,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDocFile.tlb"
-				HeaderFileName="AVSOfficeDocFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
+				HeaderFileName="ASCOfficeDocFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDocFile_i.c"
-				ProxyFileName="AVSOfficeDocFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
+				ProxyFileName="ASCOfficeDocFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Common\AvsDocxFormat\Source\Utility;..\..\Common\AvsDocxFormat\Source\DocxFormat;..\..\Common\AvsDocxFormat\Source\Common;..\..\Common\AvsDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
+				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,14 +78,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficeDocFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeDocFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\AvsDocxFormat\Lib\Debug"
+				AdditionalLibraryDirectories="..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Debug"
 				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_AVSOfficeDocFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDocFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -140,15 +140,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDocFile.tlb"
-				HeaderFileName="AVSOfficeDocFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
+				HeaderFileName="ASCOfficeDocFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDocFile_i.c"
-				ProxyFileName="AVSOfficeDocFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
+				ProxyFileName="ASCOfficeDocFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\Common\AvsDocxFormat\Source\Utility;..\..\Common\AvsDocxFormat\Source\DocxFormat;..\..\Common\AvsDocxFormat\Source\Common;..\..\Common\AvsDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
+				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -173,17 +173,17 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="..\..\..\..\Redist\AVSOfficeStudio\$(ProjectName).dll"
+				OutputFile="..\..\Redist\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\AvsDocxFormat\Lib\Release"
+				AdditionalLibraryDirectories="..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Release"
 				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_AVSOfficeDocFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDocFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -220,11 +220,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSDocFile.cpp"
+				RelativePath=".\ASCDocFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeDocFile.cpp"
+				RelativePath=".\ASCOfficeDocFile.cpp"
 				>
 			</File>
 			<File
@@ -254,11 +254,11 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AVSDocFile.h"
+				RelativePath=".\ASCDocFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeCriticalSection.h"
+				RelativePath=".\ASCOfficeCriticalSection.h"
 				>
 			</File>
 			<File
@@ -288,11 +288,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeDocFile.rc"
+				RelativePath=".\ASCOfficeDocFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeDocFile.rgs"
+				RelativePath=".\ASCOfficeDocFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeDocFile/ASCOfficeDocFile/ASCOfficeDocFile2005.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeDocFile"
+	Name="ASCOfficeDocFile"
 	ProjectGUID="{da13d6d4-39b5-49db-b5d7-d1afdbb7c320}"
-	RootNamespace="AVSOfficeDocFile"
+	RootNamespace="ASCOfficeDocFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -42,16 +42,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDocFile.tlb"
-				HeaderFileName="AVSOfficeDocFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
+				HeaderFileName="ASCOfficeDocFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDocFile_i.c"
-				ProxyFileName="AVSOfficeDocFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
+				ProxyFileName="ASCOfficeDocFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Common\AvsDocxFormat\Source\Utility;..\..\Common\AvsDocxFormat\Source\DocxFormat;..\..\Common\AvsDocxFormat\Source\Common;..\..\Common\AvsDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
+				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -77,14 +77,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficeDocFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeDocFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\AvsDocxFormat\Lib\Debug"
+				AdditionalLibraryDirectories="..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Debug"
 				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_AVSOfficeDocFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDocFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -125,7 +125,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
+				CommandLine="..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -142,15 +142,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDocFile.tlb"
-				HeaderFileName="AVSOfficeDocFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
+				HeaderFileName="ASCOfficeDocFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDocFile_i.c"
-				ProxyFileName="AVSOfficeDocFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
+				ProxyFileName="ASCOfficeDocFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\Common\AvsDocxFormat\Source\Utility;..\..\Common\AvsDocxFormat\Source\DocxFormat;..\..\Common\AvsDocxFormat\Source\Common;..\..\Common\AvsDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
+				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;;..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -175,17 +175,17 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="..\..\..\..\Redist\AVSOfficeStudio\$(ProjectName).dll"
+				OutputFile="..\..\Redist\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\AvsDocxFormat\Lib\Release"
+				AdditionalLibraryDirectories="..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Release"
 				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_AVSOfficeDocFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDocFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -244,15 +244,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDocFile.tlb"
-				HeaderFileName="AVSOfficeDocFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
+				HeaderFileName="ASCOfficeDocFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDocFile_i.c"
-				ProxyFileName="AVSOfficeDocFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
+				ProxyFileName="ASCOfficeDocFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\Common\AvsDocxFormat\Source\Utility;..\..\Common\AvsDocxFormat\Source\DocxFormat;..\..\Common\AvsDocxFormat\Source\Common;..\..\Common\AvsDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
+				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\ZLIB\zlib-1.2.3&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -279,15 +279,15 @@
 				AdditionalDependencies="Msimg32.lib"
 				OutputFile="..\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeDocFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\AvsDocxFormat\Lib\Release"
+				AdditionalLibraryDirectories="..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Release"
 				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_AVSOfficeDocFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDocFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -327,11 +327,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSDocFile.cpp"
+				RelativePath=".\ASCDocFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeDocFile.cpp"
+				RelativePath=".\ASCOfficeDocFile.cpp"
 				>
 			</File>
 			<File
@@ -369,11 +369,11 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AVSDocFile.h"
+				RelativePath=".\ASCDocFile.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeCriticalSection.h"
+				RelativePath=".\ASCOfficeCriticalSection.h"
 				>
 			</File>
 			<File
@@ -403,11 +403,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeDocFile.rc"
+				RelativePath=".\ASCOfficeDocFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeDocFile.rgs"
+				RelativePath=".\ASCOfficeDocFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeDocFile/ASCOfficeDocFile/Resource.h

@@ -3,7 +3,7 @@
 // Used by AVSOfficeDocFile.rc
 //
 #define IDS_PROJNAME                    100
-#define IDR_AVSDOCFILE                  101
+#define IDR_ASCDOCFILE                  101
 
 // Next default values for new objects
 // 

ASCOfficeDocFile/ASCOfficeDocFile/stdafx.h

@@ -55,7 +55,7 @@ using namespace ATL;
 
 #include "..\..\Common\OfficeFileErrorDescription.h"
 
-#include "AVSOfficeCriticalSection.h"
+#include "ASCOfficeCriticalSection.h"
 
 using namespace AVSDocFormatUtils;
 

ASCOfficeDocFile/ASCOfficeDocFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//117
-#define INTVER 1,0,0,117
-#define STRVER "1,0,0,117\0"
+//119
+#define INTVER 1,0,0,119
+#define STRVER "1,0,0,119\0"

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeType.h

 #pragma once
 
-#include <XmlUtils.h>
+#include <../../../Common/XmlUtils.h>
 
 #include "ProtectionBooleanProperties.h"
 #include "..\IVisitable.h"

ASCOfficeDocFile/DocxDocConverter/OfficeArt/BlipFactory.cpp

 #include "stdafx.h"
 #include "BlipFactory.h"
 
-#include "GdiplusEx.h"
+#include "../../../Common/GdiplusEx.h"
 
 namespace GdiPlusHelper
 {

ASCOfficeDocFile/DocxDocConverter/ShapePath.h

 #pragma once
 
-#include <XmlUtils.h>
+#include "../../Common/XmlUtils.h"
 #include <math.h>
 
 #include "OfficeArt\Common.h"

ASCOfficeDocFile/DocxDocConverter/ShapeSettings.h

 #pragma once
 
-#include <XmlUtils.h>
+#include "../../Common/XmlUtils.h"
 
 #include "Logic/ShapeStyle.h"
 #include "Logic/Wrap.h"

ASCOfficeDocFile/OfficeDocFile_VS2005.sln

@@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\ASCDocxFor
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\ASCDocxFormat\Projects\Utility2005.vcproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\ASCImageStudio\ASCGrapgics\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
 EndProject
 Global
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution

Common/ASCDocxFormat/ASCDocxFormat2005.sln

@@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "Projects\Utility
 		{F6A9ED1C-3D23-4246-9366-41373B2E49C6} = {F6A9ED1C-3D23-4246-9366-41373B2E49C6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\..\ASCOfficeOdtFile\Source\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F6A9ED1C-3D23-4246-9366-41373B2E49C6} = {F6A9ED1C-3D23-4246-9366-41373B2E49C6}
 	EndProjectSection

Common/ASCDocxFormat/Projects/DocxFormat2005.vcproj

@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\..\..\Redist;..\..\..\..\AVSImageStudio3\AVSGraphics\OfficeSvmFile\"
+				AdditionalIncludeDirectories=".\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\Redist;..\..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

Common/ASCDocxFormat/Source/DocxFormat/Media/Image.cpp

@@ -6,8 +6,8 @@
 #include "Image.h"
 #include "..\FileTypes.h"
 #include <boost/algorithm/string/replace.hpp>
-#include "OfficeSvmFile.h"
-#include "SvmConverter.h"
+#include "../../../../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile.h"
+#include "../../../../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/SvmConverter.h"
 #include "FileNameUtility.h"
 
 

Common/ASCDocxFormat/Source/DocxFormat/Media/Media.cpp

@@ -5,8 +5,8 @@
 
 #include "Media.h"
 #include "..\FileTypes.h"
-#include "OfficeSvmFile.h"
-#include "SvmConverter.h"
+#include "../../../../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile.h"
+#include "../../../../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/SvmConverter.h"
 #include "FileNameUtility.h"
 #include <boost/algorithm/string/replace.hpp>