git-svn-id:...

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

ASCOfficeXlsFile/ASCOfficeXlsFile.sln

 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeXlsFile", "AVSXlsFile\AVSXlsFile.vcproj", "{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeXlsFile", "ASCXlsFile\ASCXlsFile.vcproj", "{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61} = {210CA046-BD12-4711-95E6-AF4F35AB3E61}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "AVSWorksheetConverter\source\main\EWSCore.vcproj", "{210CA046-BD12-4711-95E6-AF4F35AB3E61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "ASCWorksheetConverter\source\main\EWSCore.vcproj", "{210CA046-BD12-4711-95E6-AF4F35AB3E61}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCOfficeXlsFile/ASCOfficeXlsFile_2005.sln

 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeXlsFile", "AVSXlsFile\AVSXlsFile_2005.vcproj", "{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeXlsFile", "ASCXlsFile\ASCXlsFile_2005.vcproj", "{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
@@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeXlsFile", "AVSXlsF
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61} = {210CA046-BD12-4711-95E6-AF4F35AB3E61}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "AVSWorksheetConverter\source\main\EWSCore_2005.vcproj", "{210CA046-BD12-4711-95E6-AF4F35AB3E61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "ASCWorksheetConverter\source\main\EWSCore_2005.vcproj", "{210CA046-BD12-4711-95E6-AF4F35AB3E61}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"

ASCOfficeXlsFile/ASCXlsFile/AVSXlsFile.cpp → ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile.cpp

-// AVSXlsFile.cpp : Implementation of DLL Exports.
+// ASCXlsFile.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 = "{D9F21C35-D46C-42F3-996D-D4912435F7E7}", 
-		 name = "AVSOfficeXlsFile", 
-		 helpstring = "AVSOfficeXlsFile 1.0 Type Library",
-		 resource_name = "IDR_AVSXLSFILE") ]
+		 name = "ASCOfficeXlsFile", 
+		 helpstring = "ASCOfficeXlsFile 1.0 Type Library",
+		 resource_name = "IDR_ASCXLSFILE") ]
 class CAVSXlsFileModule
 {
 public:

ASCOfficeXlsFile/ASCXlsFile/AVSXlsFile.rc → ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile.rc

@@ -9,7 +9,7 @@
 //
 #include "winres.h"
 #define COMPONENT_NAME "OfficeXlsFile"
-#include "../../../../Common/FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -91,7 +91,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSXLSFILE          REGISTRY                "AVSXlsFile.rgs"
+IDR_ASCXLSFILE          REGISTRY                "ASCXlsFile.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -100,7 +100,7 @@ IDR_AVSXLSFILE          REGISTRY                "AVSXlsFile.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSXlsFile"
+    IDS_PROJNAME            "ASCXlsFile"
 END
 
 #endif    // Russian resources

ASCOfficeXlsFile/ASCXlsFile/AVSXlsFile.rgs → ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile.rgs

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

ASCOfficeXlsFile/ASCXlsFile/AVSXlsFile.vcproj → ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="AVSOfficeXlsFile"
+	Name="ASCOfficeXlsFile"
 	ProjectGUID="{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
-	RootNamespace="AVSXlsFile"
+	RootNamespace="ASCXlsFile"
 	Keyword="AtlProj"
 	TargetFrameworkVersion="196613"
 	>
@@ -44,16 +44,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSXlsFile.tlb"
-				HeaderFileName="AVSXlsFile.h"
+				TypeLibraryName="$(IntDir)/ASCXlsFile.tlb"
+				HeaderFileName="ASCXlsFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSXlsFile_i.c"
-				ProxyFileName="AVSXlsFile_p.c"
+				InterfaceIdentifierFileName="ASCXlsFile_i.c"
+				ProxyFileName="ASCXlsFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\AVSWorksheetConverter\source\Document"
+				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="false"
 				RuntimeLibrary="1"
@@ -81,15 +81,15 @@
 				AdditionalDependencies="uafxcwd.lib LIBCMTD.lib EWSCore.res"
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../AVSWorksheetConverter/lib/$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				AddModuleNamesToAssembly=""
 				AssemblyLinkResource=""
-				MergedIDLBaseFileName="_AVSXlsFile.idl"
+				MergedIDLBaseFileName="_ASCXlsFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSXlsFile.lib"
+				ImportLibrary="$(OutDir)/ASCXlsFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -144,15 +144,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSXlsFile.tlb"
-				HeaderFileName="AVSXlsFile.h"
+				TypeLibraryName="$(IntDir)/ASCXlsFile.tlb"
+				HeaderFileName="ASCXlsFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSXlsFile_i.c"
-				ProxyFileName="AVSXlsFile_p.c"
+				InterfaceIdentifierFileName="ASCXlsFile_i.c"
+				ProxyFileName="ASCXlsFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\AVSWorksheetConverter\source\Document"
+				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -176,8 +176,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="uafxcw.lib LIBCMT.lib EWSCore.res"
-				OutputFile="../../../../Redist/AVSOfficeStudio/$(ProjectName).dll"
-				AdditionalLibraryDirectories="&quot;../AVSWorksheetConverter/lib/$(ConfigurationName)&quot;"
+				OutputFile="../../Redist/$(ProjectName).dll"
+				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
 				MidlCommandFile=""
 				IgnoreEmbeddedIDL="false"
 			/>
@@ -215,7 +215,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSXlsFile.cpp"
+				RelativePath=".\ASCXlsFile.cpp"
 				>
 			</File>
 			<File
@@ -271,11 +271,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSXlsFile.rc"
+				RelativePath=".\ASCXlsFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSXlsFile.rgs"
+				RelativePath=".\ASCXlsFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeXlsFile/ASCXlsFile/AVSXlsFile_2005.vcproj → ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile_2005.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeXlsFile"
+	Name="ASCOfficeXlsFile"
 	ProjectGUID="{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
-	RootNamespace="AVSXlsFile"
+	RootNamespace="ASCXlsFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -43,16 +43,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSXlsFile.tlb"
-				HeaderFileName="AVSXlsFile.h"
+				TypeLibraryName="$(IntDir)/ASCXlsFile.tlb"
+				HeaderFileName="ASCXlsFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSXlsFile_i.c"
-				ProxyFileName="AVSXlsFile_p.c"
+				InterfaceIdentifierFileName="ASCXlsFile_i.c"
+				ProxyFileName="ASCXlsFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\AVSWorksheetConverter\source\Document"
+				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -81,15 +81,15 @@
 				AdditionalDependencies="uafxcwd.lib LIBCMTD.lib EWSCore.res"
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;../AVSWorksheetConverter/lib/$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				AddModuleNamesToAssembly=""
 				AssemblyLinkResource=""
-				MergedIDLBaseFileName="_AVSXlsFile.idl"
+				MergedIDLBaseFileName="_ASCXlsFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSXlsFile.lib"
+				ImportLibrary="$(OutDir)/ASCXlsFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -131,7 +131,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
+				CommandLine="..\..\..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -148,15 +148,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSXlsFile.tlb"
-				HeaderFileName="AVSXlsFile.h"
+				TypeLibraryName="$(IntDir)/ASCXlsFile.tlb"
+				HeaderFileName="ASCXlsFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSXlsFile_i.c"
-				ProxyFileName="AVSXlsFile_p.c"
+				InterfaceIdentifierFileName="ASCXlsFile_i.c"
+				ProxyFileName="ASCXlsFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\AVSWorksheetConverter\source\Document"
+				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -180,8 +180,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="uafxcw.lib LIBCMT.lib EWSCore.res"
-				OutputFile="../../../../Redist/AVSOfficeStudio/$(ProjectName).dll"
-				AdditionalLibraryDirectories="&quot;../AVSWorksheetConverter/lib/$(ConfigurationName)&quot;"
+				OutputFile="../../Redist/$(ProjectName).dll"
+				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
 				MidlCommandFile=""
 				IgnoreEmbeddedIDL="false"
 			/>
@@ -224,7 +224,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
+				CommandLine="..\..\..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
 				ExcludedFromBuild="true"
 			/>
 			<Tool
@@ -242,15 +242,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSXlsFile.tlb"
-				HeaderFileName="AVSXlsFile.h"
+				TypeLibraryName="$(IntDir)/ASCXlsFile.tlb"
+				HeaderFileName="ASCXlsFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSXlsFile_i.c"
-				ProxyFileName="AVSXlsFile_p.c"
+				InterfaceIdentifierFileName="ASCXlsFile_i.c"
+				ProxyFileName="ASCXlsFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\AVSWorksheetConverter\source\Document"
+				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -275,7 +275,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="uafxcw.lib LIBCMT.lib EWSCore.res"
 				OutputFile="../../../../..\ASC\Redist/ASCOfficeStudio/ASCOfficeXlsFile.dll"
-				AdditionalLibraryDirectories="&quot;../AVSWorksheetConverter/lib/$(ConfigurationName)&quot;"
+				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
 				MidlCommandFile=""
 				IgnoreEmbeddedIDL="false"
 			/>
@@ -316,7 +316,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSXlsFile.cpp"
+				RelativePath=".\ASCXlsFile.cpp"
 				>
 			</File>
 			<File
@@ -380,11 +380,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSXlsFile.rc"
+				RelativePath=".\ASCXlsFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSXlsFile.rgs"
+				RelativePath=".\ASCXlsFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeXlsFile/ASCXlsFile/Resource.h

@@ -3,7 +3,7 @@
 // Used by AVSXlsFile.rc
 //
 #define IDS_PROJNAME                    100
-#define IDR_AVSXLSFILE                  101
+#define IDR_ASCXLSFILE                  101
 
 // Next default values for new objects
 //