git-svn-id:...

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

.gitattributes

@@ -170,7 +170,7 @@ ASCImageStudio3/AVSImageView5/Tracking/_Tracking.h svn_mime_002dtype=application
 ASCImageStudio3/AVSImageView5/cursor1.cur svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/AVSImageView5/cursor2.cur svn_mime_002dtype=application%2Foctet-stream
 ASCImageStudio3/AVSImageView5/pdb_maker.exe svn_mime_002dtype=application%2Foctet-stream
-ASCOfficeDjVuFile/AVSOfficeDjVuFile.aps svn_mime_002dtype=application%2Foctet-stream
+ASCOfficeDjVuFile/ASCOfficeDjVuFile.aps svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeDjVuFile/Test/Test/bin/Debug/Interop.AVSOfficeDjVuFile.dll svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeDjVuFile/Test/Test/bin/Debug/Test.exe svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeDjVuFile/Test/Test/bin/Debug/Test.pdb svn_mime_002dtype=application%2Foctet-stream

ASCOfficeDjVuFile/AVSOfficeDjVuFile.cpp → ASCOfficeDjVuFile/ASCOfficeDjVuFile.cpp

-// AVSDjVuFile.cpp : Implementation of DLL Exports.
+// ASCDjVuFile.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -9,9 +9,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{4481D89B-F057-495e-A9C7-54D72A248720}", 
-		 name = "AVSOfficeDjVuFile", 
-		 helpstring = "AVSOfficeDjVuFile 1.0 Type Library",
-		 resource_name = "IDR_AVSDJVUFILE") ]
+		 name = "ASCOfficeDjVuFile", 
+		 helpstring = "ASCOfficeDjVuFile 1.0 Type Library",
+		 resource_name = "IDR_ASCDJVUFILE") ]
 class CAVSDjVuFileModule
 {
 public:

ASCOfficeDjVuFile/AVSOfficeDjVuFile.rc → ASCOfficeDjVuFile/ASCOfficeDjVuFile.rc

@@ -114,7 +114,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSDJVUFILE       REGISTRY                "AVSOfficeDjvuFile.rgs"
+IDR_ASCDJVUFILE       REGISTRY                "ASCOfficeDjvuFile.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -123,7 +123,7 @@ IDR_AVSDJVUFILE       REGISTRY                "AVSOfficeDjvuFile.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSOfficeDjvuFile"
+    IDS_PROJNAME            "ASCOfficeDjvuFile"
 END
 
 #endif    // English (U.S.) resources

ASCOfficeDjVuFile/AVSOfficeDjVuFile.rgs → ASCOfficeDjVuFile/ASCOfficeDjVuFile.rgs

@@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSOfficeDjVuFile'
-		'AVSTxtFile.DLL'
+		'%APPID%' = s 'ASCOfficeDjVuFile'
+		'ASCOfficeDjVuFile.DLL'
 		{
 			val AppID = s '%APPID%'
 		}

ASCOfficeDjVuFile/AVSOfficeDjVuFile.sln → ASCOfficeDjVuFile/ASCOfficeDjVuFile.sln

 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeDjVuFile", "AVSOfficeDjVuFile.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDjVuFile", "ASCOfficeDjVuFile.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6B5B52CC-2951-4BBA-B2C9-2631BE7ECFCD} = {6B5B52CC-2951-4BBA-B2C9-2631BE7ECFCD}
 	EndProjectSection

ASCOfficeDjVuFile/AVSOfficeDjVuFile.vcproj → ASCOfficeDjVuFile/ASCOfficeDjVuFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeDjVuFile"
+	Name="ASCOfficeDjVuFile"
 	ProjectGUID="{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
-	RootNamespace="AVSOfficeDjVuFile"
+	RootNamespace="ASCOfficeDjVuFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -43,16 +43,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDjVuFile.tlb"
-				HeaderFileName="AVSOfficeDjVuFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDjVuFile.tlb"
+				HeaderFileName="ASCOfficeDjVuFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDjVuFile_i.c"
-				ProxyFileName="AVSOfficeDjVuFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDjVuFile_i.c"
+				ProxyFileName="ASCOfficeDjVuFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="Source;.\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source\TxtFormat"
+				AdditionalIncludeDirectories="Source;.\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source\TxtFormat"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,14 +78,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficeDjVuFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeDjVuFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=".\..\Common\AvsDocxFormat\Lib\Debug; ..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
+				AdditionalLibraryDirectories=".\..\Common\ASCDocxFormat\Lib\Debug; ..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
 				IgnoreDefaultLibraryNames="LIBC.lib"
-				MergedIDLBaseFileName="_AVSOfficeDjVuFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDjVuFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDjVuFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDjVuFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -143,11 +143,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDjVuFile.tlb"
-				HeaderFileName="AVSOfficeDjVuFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDjVuFile.tlb"
+				HeaderFileName="ASCOfficeDjVuFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDjVuFile_i.c"
-				ProxyFileName="AVSOfficeDjVuFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDjVuFile_i.c"
+				ProxyFileName="ASCOfficeDjVuFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -177,15 +177,15 @@
 				AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
 				OutputFile="Release\$(ProjectName).dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=".\..\Common\AvsDocxFormat\Lib\Release; ..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
+				AdditionalLibraryDirectories=".\..\Common\ASCDocxFormat\Lib\Release; ..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
 				IgnoreDefaultLibraryNames="LIBC.lib"
-				MergedIDLBaseFileName="_AVSOfficeDjVuFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDjVuFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDjVuFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDjVuFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -212,7 +212,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\..\Redist\AVSOfficeStudio&quot;&#x0D;&#x0A;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -244,11 +244,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeDjVuFile.tlb"
-				HeaderFileName="AVSOfficeDjVuFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeDjVuFile.tlb"
+				HeaderFileName="ASCOfficeDjVuFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeDjVuFile_i.c"
-				ProxyFileName="AVSOfficeDjVuFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeDjVuFile_i.c"
+				ProxyFileName="ASCOfficeDjVuFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -278,15 +278,15 @@
 				AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
 				OutputFile="Release\ASCOfficeDjVuFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=".\..\Common\AvsDocxFormat\Lib\Release; ..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
+				AdditionalLibraryDirectories=".\..\Common\ASCDocxFormat\Lib\Release; ..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
 				IgnoreDefaultLibraryNames="LIBC.lib"
-				MergedIDLBaseFileName="_AVSOfficeDjVuFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeDjVuFile.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeDjVuFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeDjVuFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -326,14 +326,14 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeDjVuFile.cpp"
+				RelativePath=".\ASCOfficeDjVuFile.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -341,7 +341,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -349,7 +349,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 			</File>
@@ -361,7 +361,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -369,7 +369,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -377,7 +377,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 			</File>
@@ -390,7 +390,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -399,7 +399,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -408,7 +408,7 @@
 					<Tool
 						Name="VCCLCompilerTool"
 						UsePrecompiledHeader="1"
-						ObjectFile="$(IntDir)\Avs\"
+						ObjectFile="$(IntDir)\ASC\"
 					/>
 				</FileConfiguration>
 			</File>
@@ -457,11 +457,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeDjVuFile.rc"
+				RelativePath=".\ASCOfficeDjVuFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeDjVuFile.rgs"
+				RelativePath=".\ASCOfficeDjVuFile.rgs"
 				>
 			</File>
 		</Filter>