From 56b85d28365af5cff80ae33a489c53228e4e7318 Mon Sep 17 00:00:00 2001
From: "Ivan.Shulga" <Ivan.Shulga@onlyoffice.com>
Date: Thu, 21 Nov 2013 10:26:03 +0000
Subject: [PATCH] git-svn-id:
 svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52305
 954022d7-b5bf-4e40-9824-e11837661b57

---
 ...OfficeRtfFile.cpp => ASCOfficeRtfFile.cpp} |  6 +--
 ...VSOfficeRtfFile.rc => ASCOfficeRtfFile.rc} |  6 +--
 ASCOfficeRtfFile/ASCOfficeRtfFile.rgs         | 11 +++++
 ...OfficeRtfFile.sln => ASCOfficeRtfFile.sln} |  2 +-
 ...RtfFile.vcproj => ASCOfficeRtfFile.vcproj} | 44 +++++++++----------
 ASCOfficeRtfFile/AVSOfficeRtfFile.rgs         | 11 -----
 6 files changed, 40 insertions(+), 40 deletions(-)
 rename ASCOfficeRtfFile/{AVSOfficeRtfFile.cpp => ASCOfficeRtfFile.cpp} (71%)
 rename ASCOfficeRtfFile/{AVSOfficeRtfFile.rc => ASCOfficeRtfFile.rc} (91%)
 create mode 100644 ASCOfficeRtfFile/ASCOfficeRtfFile.rgs
 rename ASCOfficeRtfFile/{AVSOfficeRtfFile.sln => ASCOfficeRtfFile.sln} (86%)
 rename ASCOfficeRtfFile/{AVSOfficeRtfFile.vcproj => ASCOfficeRtfFile.vcproj} (89%)
 delete mode 100644 ASCOfficeRtfFile/AVSOfficeRtfFile.rgs

diff --git a/ASCOfficeRtfFile/AVSOfficeRtfFile.cpp b/ASCOfficeRtfFile/ASCOfficeRtfFile.cpp
similarity index 71%
rename from ASCOfficeRtfFile/AVSOfficeRtfFile.cpp
rename to ASCOfficeRtfFile/ASCOfficeRtfFile.cpp
index d2eb3de213..85825e825b 100644
--- a/ASCOfficeRtfFile/AVSOfficeRtfFile.cpp
+++ b/ASCOfficeRtfFile/ASCOfficeRtfFile.cpp
@@ -7,9 +7,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{C07579F8-D15E-483E-B99F-1CD4DE337DAE}", 
-		 name = "AVSOfficeRtfFile", 
-		 helpstring = "AVSOfficeRtfFile 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICERTFFILE") ]
+		 name = "ASCOfficeRtfFile", 
+		 helpstring = "ASCOfficeRtfFile 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICERTFFILE") ]
 class CAVSOfficeRtfFileModule
 {
 public:
diff --git a/ASCOfficeRtfFile/AVSOfficeRtfFile.rc b/ASCOfficeRtfFile/ASCOfficeRtfFile.rc
similarity index 91%
rename from ASCOfficeRtfFile/AVSOfficeRtfFile.rc
rename to ASCOfficeRtfFile/ASCOfficeRtfFile.rc
index 4698293a81..1a022d593f 100644
--- a/ASCOfficeRtfFile/AVSOfficeRtfFile.rc
+++ b/ASCOfficeRtfFile/ASCOfficeRtfFile.rc
@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeRtfFile"
-#include "../../../../Common/FileInfo.h"
+#include "../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -87,10 +87,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSOfficeRtfFile"
+	IDS_PROJNAME					"ASCOfficeRtfFile"
 END
 
-IDR_AVSOFFICERTFFILE REGISTRY "AVSOfficeRtfFile.rgs"
+IDR_ASCOFFICERTFFILE REGISTRY "ASCOfficeRtfFile.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 //
diff --git a/ASCOfficeRtfFile/ASCOfficeRtfFile.rgs b/ASCOfficeRtfFile/ASCOfficeRtfFile.rgs
new file mode 100644
index 0000000000..ce096e52a2
--- /dev/null
+++ b/ASCOfficeRtfFile/ASCOfficeRtfFile.rgs
@@ -0,0 +1,11 @@
+HKCR
+{
+	NoRemove AppID
+	{
+		'%APPID%' = s 'ASCOfficeRtfFile'
+		'ASCOfficeRtfFile.DLL'
+		{
+			val AppID = s '%APPID%'
+		}
+	}
+}
diff --git a/ASCOfficeRtfFile/AVSOfficeRtfFile.sln b/ASCOfficeRtfFile/ASCOfficeRtfFile.sln
similarity index 86%
rename from ASCOfficeRtfFile/AVSOfficeRtfFile.sln
rename to ASCOfficeRtfFile/ASCOfficeRtfFile.sln
index 15317c4200..6774ed7c54 100644
--- a/ASCOfficeRtfFile/AVSOfficeRtfFile.sln
+++ b/ASCOfficeRtfFile/ASCOfficeRtfFile.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeRtfFile", "AVSOfficeRtfFile.vcproj", "{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeRtfFile", "ASCOfficeRtfFile.vcproj", "{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/ASCOfficeRtfFile/AVSOfficeRtfFile.vcproj b/ASCOfficeRtfFile/ASCOfficeRtfFile.vcproj
similarity index 89%
rename from ASCOfficeRtfFile/AVSOfficeRtfFile.vcproj
rename to ASCOfficeRtfFile/ASCOfficeRtfFile.vcproj
index 80286c6dcb..cd89f57fd4 100644
--- a/ASCOfficeRtfFile/AVSOfficeRtfFile.vcproj
+++ b/ASCOfficeRtfFile/ASCOfficeRtfFile.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="AVSOfficeRtfFile"
+	Name="ASCOfficeRtfFile"
 	ProjectGUID="{BE2FD36F-184C-4F29-BC75-2355AC3A2F27}"
-	RootNamespace="AVSOfficeRtfFile"
+	RootNamespace="ASCOfficeRtfFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -42,11 +42,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeRtfFile.tlb"
-				HeaderFileName="AVSOfficeRtfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeRtfFile.tlb"
+				HeaderFileName="ASCOfficeRtfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeRtfFile_i.c"
-				ProxyFileName="AVSOfficeRtfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeRtfFile_i.c"
+				ProxyFileName="ASCOfficeRtfFile_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -79,7 +79,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSOfficeRtfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -137,11 +137,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeRtfFile.tlb"
-				HeaderFileName="AVSOfficeRtfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeRtfFile.tlb"
+				HeaderFileName="ASCOfficeRtfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeRtfFile_i.c"
-				ProxyFileName="AVSOfficeRtfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeRtfFile_i.c"
+				ProxyFileName="ASCOfficeRtfFile_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -172,7 +172,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSOfficeRtfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -203,7 +203,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy to redist"
-				CommandLine="copy $(TargetPath) ..\..\..\Redist\AVSOfficeStudio\AVSOfficeRtfFile.dll"
+				CommandLine="copy $(TargetPath) ..\Redist\ASCOfficeRtfFile.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -217,7 +217,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\..\..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 				ExcludedFromBuild="true"
 			/>
 			<Tool
@@ -235,11 +235,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeRtfFile.tlb"
-				HeaderFileName="AVSOfficeRtfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeRtfFile.tlb"
+				HeaderFileName="ASCOfficeRtfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeRtfFile_i.c"
-				ProxyFileName="AVSOfficeRtfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeRtfFile_i.c"
+				ProxyFileName="ASCOfficeRtfFile_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -271,7 +271,7 @@
 				IgnoreImportLibrary="true"
 				OutputFile="$(OutDir)\ASCOfficeRtfFile.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSOfficeRtfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeRtfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -315,7 +315,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeRtfFile.cpp"
+				RelativePath=".\ASCOfficeRtfFile.cpp"
 				>
 			</File>
 			<File
@@ -383,11 +383,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeRtfFile.rc"
+				RelativePath=".\ASCOfficeRtfFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeRtfFile.rgs"
+				RelativePath=".\ASCOfficeRtfFile.rgs"
 				>
 			</File>
 			<Filter
diff --git a/ASCOfficeRtfFile/AVSOfficeRtfFile.rgs b/ASCOfficeRtfFile/AVSOfficeRtfFile.rgs
deleted file mode 100644
index fd46e82972..0000000000
--- a/ASCOfficeRtfFile/AVSOfficeRtfFile.rgs
+++ /dev/null
@@ -1,11 +0,0 @@
-HKCR
-{
-	NoRemove AppID
-	{
-		'%APPID%' = s 'AVSOfficeRtfFile'
-		'AVSOfficeRtfFile.DLL'
-		{
-			val AppID = s '%APPID%'
-		}
-	}
-}