git-svn-id:...

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

ASCOfficeSVGFile/AVSOfficeSVGFile/AVSOfficeSVGFile.cpp → ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.cpp

@@ -2,9 +2,9 @@
 #include "resource.h"
 
 [ module(dll, uuid = "{0F7AB98F-4157-4811-9466-605BA7D603F0}", 
-		 name = "AVSOfficeSVGFile", 
-		 helpstring = "AVSOfficeSVGFile 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICESVGFILE") ]
+		 name = "ASCOfficeSVGFile", 
+		 helpstring = "ASCOfficeSVGFile 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICESVGFILE") ]
 
 class CAVSOfficeSVGFileModule
 {

ASCOfficeSVGFile/AVSOfficeSVGFile/AVSOfficeSVGFile.rc → ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.rc

 //Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
+#define COMPONENT_NAME "OfficeSvgFile"
+#include "../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -57,22 +59,22 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041904e3"
+        BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "Online Media Technologies Ltd."
-            VALUE "FileDescription", "AVSOfficeSVGFile ActiveX DLL"
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX
             VALUE "FileVersion", STRVER
-            VALUE "LegalCopyright", "Online Media Technologies Ltd. Copyright 2011"
-            VALUE "LegalTrademarks", "Online Media Technologies Ltd."
-            VALUE "InternalName", "AVSOfficeSVGFile.dll"
-            VALUE "OriginalFilename", "AVSOfficeSVGFile.dll"
-            VALUE "ProductName", "AVSOfficeSVGFile ActiveX DLL"
+            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
+            VALUE "LegalCopyright", LEGAL_COPYRIGHT
+            VALUE "LegalTrademarks", LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL
+            VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX
             VALUE "ProductVersion", STRVER
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-		VALUE "Translation", 0x0419, 1251
+		VALUE "Translation", 0x0409, 1252
     END
 END
 
@@ -85,10 +87,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSOfficeSVGFile"
+	IDS_PROJNAME					"ASCOfficeSVGFile"
 END
 
-IDR_AVSOFFICESVGFILE REGISTRY "AVSOfficeSVGFile.rgs"
+IDR_ASCOFFICESVGFILE REGISTRY "ASCOfficeSVGFile.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCOfficeSVGFile/AVSOfficeSVGFile/AVSOfficeSVGFile.rgs → ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.rgs

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

ASCOfficeSVGFile/AVSOfficeSVGFile/AVSOfficeSVGFile.vcproj → ASCOfficeSVGFile/AVSOfficeSVGFile/ASCOfficeSVGFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="AVSOfficeSVGFile"
+	Name="ASCOfficeSVGFile"
 	ProjectGUID="{41BACC7A-092E-46E1-834B-4EAD85A106C2}"
-	RootNamespace="AVSOfficeSVGFile"
+	RootNamespace="ASCOfficeSVGFile"
 	Keyword="AtlProj"
 	TargetFrameworkVersion="131072"
 	>
@@ -43,16 +43,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeSVGFile.tlb"
-				HeaderFileName="AVSOfficeSVGFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeSVGFile.tlb"
+				HeaderFileName="ASCOfficeSVGFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeSVGFile_i.c"
-				ProxyFileName="AVSOfficeSVGFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeSVGFile_i.c"
+				ProxyFileName="ASCOfficeSVGFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="x:\AVS\Sources\AVSOfficeStudio\Common;agg\;agg\include;Expat\;..\..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType;\AVS\Sources\AVSVideoStudio3\Common"
+				AdditionalIncludeDirectories="..\Common;agg\;agg\include;Expat\;..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;__FOR_TESTS__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -77,14 +77,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSOfficeSVGFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeSVGFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\AVSImageStudio3\AVSGraphics;$(NOINHERIT)"
-				MergedIDLBaseFileName="_AVSOfficeSVGFile.idl"
+				AdditionalLibraryDirectories="..\ASCImageStudio3\ASCGraphics;$(NOINHERIT)"
+				MergedIDLBaseFileName="_ASCOfficeSVGFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				StackReserveSize="0"
-				ImportLibrary="$(OutDir)/AVSOfficeSVGFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeSVGFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -122,7 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
+				CommandLine="..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -139,15 +139,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeSVGFile.tlb"
-				HeaderFileName="AVSOfficeSVGFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeSVGFile.tlb"
+				HeaderFileName="ASCOfficeSVGFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeSVGFile_i.c"
-				ProxyFileName="AVSOfficeSVGFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeSVGFile_i.c"
+				ProxyFileName="ASCOfficeSVGFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="x:\AVS\Sources\AVSOfficeStudio\Common;agg\;agg\include;Expat\;..\..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType;\AVS\Sources\AVSVideoStudio3\Common"
+				AdditionalIncludeDirectories="..\Common;agg\;agg\include;Expat\;..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;__FOR_TESTS__"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -170,15 +170,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSOfficeSVGFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeSVGFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType;$(NOINHERIT)"
-				MergedIDLBaseFileName="_AVSOfficeSVGFile.idl"
+				AdditionalLibraryDirectories="..\ASCImageStudio3\ASCGraphics\Objects\Font\FreeType;$(NOINHERIT)"
+				MergedIDLBaseFileName="_ASCOfficeSVGFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeSVGFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeSVGFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -202,7 +202,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy $(TargetPath) X:\AVS\Redist\AVSOfficeStudio\AVSOfficeSVGFile.dll&#x0D;&#x0A;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy $(TargetPath) &quot..\Redist\&quot&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -215,7 +215,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeSVGFile.cpp"
+				RelativePath=".\ASCOfficeSVGFile.cpp"
 				>
 			</File>
 			<File
@@ -259,11 +259,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeSVGFile.rc"
+				RelativePath=".\ASCOfficeSVGFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeSVGFile.rgs"
+				RelativePath=".\ASCOfficeSVGFile.rgs"
 				>
 			</File>
 		</Filter>
@@ -271,31 +271,31 @@
 			Name="Common"
 			>
 			<File
-				RelativePath="..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\AVSRenderer.h"
+				RelativePath="..\ASCImageStudio3\ASCGraphics\Interfaces\ASCRenderer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\AVSVideoStudio3\Common\AVSUtils.h"
+				RelativePath="..\Common\ASCUtils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeCommandsRenderer.h"
+				RelativePath="..\Common\OfficeCommandsRenderer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeDefines.h"
+				RelativePath="..\Common\OfficeDefines.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeFileErrorDescription.h"
+				RelativePath="..\Common\OfficeFileErrorDescription.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeFileFormats.h"
+				RelativePath="..\Common\OfficeFileFormats.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\OfficeFileTemplate.h"
+				RelativePath="..\Common\OfficeFileTemplate.h"
 				>
 			</File>
 		</Filter>
@@ -315,11 +315,11 @@
 			Name="SVG Files"
 			>
 			<File
-				RelativePath="..\..\..\AVSImageStudio3\AVSGraphics\Objects\Image\SVG\SVGFramework.cpp"
+				RelativePath="..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\AVSImageStudio3\AVSGraphics\Objects\Image\SVG\SVGFramework.h"
+				RelativePath="..\ASCImageStudio3\ASCGraphics\Objects\Image\SVG\SVGFramework.h"
 				>
 			</File>
 		</Filter>

ASCOfficeSVGFile/AVSOfficeSVGFile/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSOfficeSVGFile.rc
+// Used by ASCOfficeSVGFile.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICESVGFILE	101
+#define IDR_ASCOFFICESVGFILE	101
 
 // Next default values for new objects
 //