git-svn-id:...

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

ASCPresentationEditor/AVSPresentationEditor.cpp → ASCPresentationEditor/ASCPresentationEditor.cpp

-// AVSPresentationEditor.cpp : Implementation of DLL Exports.
+// ASCPresentationEditor.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
 #include "resource.h"
 
-#include "AVSPresentationEditor.h"
+#include "ASCPresentationEditor.h"
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{B34974D7-C020-45b2-8A19-AFC20526B083}", 
-		 name = "AVSPresentationEditor", 
-		 helpstring = "AVSPresentationEditor 1.0 Type Library",
-		 resource_name = "IDR_AVSPRESENTATIONEDITOR") ];
+		 name = "ASCPresentationEditor", 
+		 helpstring = "ASCPresentationEditor 1.0 Type Library",
+		 resource_name = "IDR_ASCPRESENTATIONEDITOR") ];
 		 

ASCPresentationEditor/AVSPresentationEditor.h → ASCPresentationEditor/ASCPresentationEditor.h

-// CAVSPresentationEditor.h : Declaration of the CAVSOfficeViewer
+// CASCPresentationEditor.h : Declaration of the CASCOfficeViewer
 #pragma once
 #include "stdafx.h"
 #include "resource.h"       // main symbols

ASCPresentationEditor/AVSPresentationEditor.rc → ASCPresentationEditor/ASCPresentationEditor.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "PresentationEditor"
-#include "../../../../Common/FileInfo.h"
+#include "../Common/FileInfo.h"
 #include "version.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -91,10 +91,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSPresentationEditor"
+	IDS_PROJNAME					"ASCPresentationEditor"
 END
 
-IDR_AVSPRESENTATIONEDITOR REGISTRY "AVSPresentationEditor.rgs"
+IDR_ASCPRESENTATIONEDITOR REGISTRY "ASCPresentationEditor.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCPresentationEditor/AVSPresentationEditor.rgs → ASCPresentationEditor/ASCPresentationEditor.rgs

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

ASCPresentationEditor/AVSPresentationEditor.sln → ASCPresentationEditor/ASCPresentationEditor.sln

 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSPresentationEditor", "AVSPresentationEditor.vcproj", "{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCPresentationEditor", "ASCPresentationEditor.vcproj", "{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCPresentationEditor/AVSPresentationEditor.vcproj → ASCPresentationEditor/ASCPresentationEditor.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="AVSPresentationEditor"
+	Name="ASCPresentationEditor"
 	ProjectGUID="{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
 	Keyword="AtlProj"
 	TargetFrameworkVersion="131072"
@@ -42,17 +42,17 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSPresentationEditor.tlb"
-				HeaderFileName="AVSPresentationEditor.h"
+				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
+				HeaderFileName="ASCPresentationEditor.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSPresentationEditor_i.c"
-				ProxyFileName="AVSPresentationEditor_p.c"
+				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
+				ProxyFileName="ASCPresentationEditor_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\AVSPresentationEditor"
+				AdditionalIncludeDirectories="..\ASCPresentationEditor"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,7 +79,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSPresentationEditor.idl"
+				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
@@ -138,17 +138,17 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSPresentationEditor.tlb"
-				HeaderFileName="AVSPresentationEditor.h"
+				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
+				HeaderFileName="ASCPresentationEditor.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSPresentationEditor_i.c"
-				ProxyFileName="AVSPresentationEditor_p.c"
+				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
+				ProxyFileName="ASCPresentationEditor_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\AVSPresentationEditor"
+				AdditionalIncludeDirectories="..\ASCPresentationEditor"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -174,7 +174,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSPresentationEditor.idl"
+				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -204,7 +204,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>
 	</Configurations>
@@ -217,7 +217,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.cpp"
+				RelativePath=".\ASCPresentationEditor.cpp"
 				>
 			</File>
 			<File
@@ -247,7 +247,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.h"
+				RelativePath=".\ASCPresentationEditor.h"
 				>
 			</File>
 			<File
@@ -269,11 +269,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.rc"
+				RelativePath=".\ASCPresentationEditor.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSPresentationEditor.rgs"
+				RelativePath=".\ASCPresentationEditor.rgs"
 				>
 			</File>
 		</Filter>

ASCPresentationEditor/AVSPresentationEditor_vs2005.sln → ASCPresentationEditor/ASCPresentationEditor_vs2005.sln

 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSPresentationEditor", "AVSPresentationEditor_vs2005.vcproj", "{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCPresentationEditor", "ASCPresentationEditor_vs2005.vcproj", "{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCPresentationEditor/AVSPresentationEditor_vs2005.vcproj → ASCPresentationEditor/ASCPresentationEditor_vs2005.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSPresentationEditor"
+	Name="ASCPresentationEditor"
 	ProjectGUID="{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
 	Keyword="AtlProj"
 	>
@@ -41,17 +41,17 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSPresentationEditor.tlb"
-				HeaderFileName="AVSPresentationEditor.h"
+				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
+				HeaderFileName="ASCPresentationEditor.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSPresentationEditor_i.c"
-				ProxyFileName="AVSPresentationEditor_p.c"
+				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
+				ProxyFileName="ASCPresentationEditor_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\AVSPresentationEditor;..\..\..\..\Common;..\..\AVSVideoStudio3\Common"
+				AdditionalIncludeDirectories="..\ASCPresentationEditor;..\Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,7 +78,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSPresentationEditor.idl"
+				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -138,17 +138,17 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSPresentationEditor.tlb"
-				HeaderFileName="AVSPresentationEditor.h"
+				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
+				HeaderFileName="ASCPresentationEditor.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSPresentationEditor_i.c"
-				ProxyFileName="AVSPresentationEditor_p.c"
+				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
+				ProxyFileName="ASCPresentationEditor_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\AVSPresentationEditor;..\..\..\..\Common;..\..\AVSVideoStudio3\Common"
+				AdditionalIncludeDirectories="..\ASCPresentationEditor;..\Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -174,7 +174,7 @@
 				RegisterOutput="true"
 				IgnoreImportLibrary="true"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSPresentationEditor.idl"
+				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -205,7 +205,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
@@ -237,17 +237,17 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSPresentationEditor.tlb"
-				HeaderFileName="AVSPresentationEditor.h"
+				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
+				HeaderFileName="ASCPresentationEditor.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSPresentationEditor_i.c"
-				ProxyFileName="AVSPresentationEditor_p.c"
+				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
+				ProxyFileName="ASCPresentationEditor_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\AVSPresentationEditor;..\..\..\..\Common;..\..\AVSVideoStudio3\Common"
+				AdditionalIncludeDirectories="..\ASCPresentationEditor;..\Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -274,7 +274,7 @@
 				IgnoreImportLibrary="true"
 				OutputFile="$(OutDir)\ASCPresentationEditor.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSPresentationEditor.idl"
+				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -318,7 +318,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.cpp"
+				RelativePath=".\ASCPresentationEditor.cpp"
 				>
 			</File>
 			<File
@@ -356,7 +356,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.h"
+				RelativePath=".\ASCPresentationEditor.h"
 				>
 			</File>
 			<File
@@ -378,11 +378,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSPresentationEditor.rc"
+				RelativePath=".\ASCPresentationEditor.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSPresentationEditor.rgs"
+				RelativePath=".\ASCPresentationEditor.rgs"
 				>
 			</File>
 		</Filter>

ASCPresentationEditor/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSPresentationEditor.rc
+// Used by ASCPresentationEditor.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSPRESENTATIONEDITOR		101
+#define IDR_ASCPRESENTATIONEDITOR		101
 
 #define IDB_XML_NOTESTHEME				201
 #define IDB_XML_NOTESMASTER				202

ASCPresentationEditor/stdafx.h

@@ -54,16 +54,16 @@ using namespace Gdiplus;
 #define _PRESENTATION_WRITER_
 
 #include "../Common/OfficeFileTemplate.h"
-#include "../../AVSImageStudio3/AVSGraphics/Interfaces/AVSRenderer.h"
-
-#import "../../../../AVS/Redist/AVSMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../../../../AVS/Redist/AVSImageFile3.dll"				named_guids rename_namespace("ImageFile")
-#import "../../../../AVS/Redist/AVSVideoFile3.dll"				named_guids rename_namespace("VideoFile"), raw_interfaces_only
-#import "../../../../AVS/Redist/AVSGraphics.dll"				named_guids rename_namespace("AVSGraphics"), raw_interfaces_only, exclude("IAVSRenderer")
-#import "../../../../AVS/Redist/AVSOfficeStudio/AVSHTMLRenderer.dll"			named_guids rename_namespace("HTMLRenderer"), raw_interfaces_only, exclude("IAVSRenderer")
-
-#import "../../../../AVS/Redist/AVSOfficeStudio\AVSOfficePPTFile.dll"	named_guids rename_namespace("PPTFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
-#import "../../../../AVS/Redist/AVSOfficeStudio\AVSOfficePPTXFile.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
-#import "../../../../AVS/Redist/AVSOfficeStudio\AVSOfficeOdpFile.dll"	named_guids rename_namespace("ODPFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
-#import "../../../../AVS/Redist/AVSOfficeStudio\AVSOfficePDFWriter.dll"	named_guids rename_namespace("PDFFile"),  raw_interfaces_only, exclude("IAVSRenderer")
+#include "../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
+
+#import "../Redist/ASCMediaCore3.dll"				named_guids rename_namespace("MediaCore"), exclude("tagRECT")
+#import "../Redist/ASCImageFile3.dll"				named_guids rename_namespace("ImageFile")
+#import "../Redist/ASCVideoFile3.dll"				named_guids rename_namespace("VideoFile"), raw_interfaces_only
+#import "../Redist/ASCGraphics.dll"				named_guids rename_namespace("AVSGraphics"), raw_interfaces_only, exclude("IAVSRenderer")
+#import "../Redist/ASCHTMLRenderer.dll"			named_guids rename_namespace("HTMLRenderer"), raw_interfaces_only, exclude("IAVSRenderer")
+
+#import "../Redist/ASCOfficePPTFile.dll"	named_guids rename_namespace("PPTFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
+#import "../Redist/ASCOfficePPTXFile.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
+#import "../Redist/ASCOfficeOdpFile.dll"	named_guids rename_namespace("ODPFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
+#import "../Redist/ASCOfficePDFWriter.dll"	named_guids rename_namespace("PDFFile"),  raw_interfaces_only, exclude("IAVSRenderer")