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

2026-04-07 13:55:33 +08:00 · 2013-11-26 14:49:17 +00:00
parent d7d9c695d6
commit 357b166dcc
12 changed files with 50 additions and 579 deletions
--- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "AVSOfficeDrawingConverter.h"
+#include "ASCOfficeDrawingConverter.h"

 #include "./PPTXFormat/Logic/SpTreeElem.h"
 #include "./PPTXFormat/Logic/Shape.h"
--- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
+++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
--- a/ASCOfficePPTXFile/ASCOfficePPTXFile.cpp
+++ b/ASCOfficePPTXFile/ASCOfficePPTXFile.cpp
@ -0,0 +1,13 @@
+//ASCOfficePPTXFile.cpp : Implementation of DLL Exports.
+
+#include "stdafx.h"
+#include "resource.h"
+
+#include "ASCOfficePPTXFile.h"
+#include "ASCOfficeDrawingConverter.h"
+
+// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
+[ module(dll, uuid = "{95DEE027-7707-4078-A314-33D35AE842FD}", 
+		 name = "ASCOfficePPTXFile", 
+		 helpstring = "ASCOfficePPTXFile 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICEPPTXFILE") ];
--- a/ASCOfficePPTXFile/ASCOfficePPTXFile.h
+++ b/ASCOfficePPTXFile/ASCOfficePPTXFile.h
--- a/ASCOfficePPTXFile/ASCOfficePPTXFile.rc
+++ b/ASCOfficePPTXFile/ASCOfficePPTXFile.rc
@ -120,7 +120,7 @@ END
 // REGISTRY
 //

-IDR_AVSOFFICEPPTXFILE       REGISTRY                "AVSOfficePPTXFile.rgs"
+IDR_ASCOFFICEPPTXFILE       REGISTRY                "ASCOfficePPTXFile.rgs"

 /////////////////////////////////////////////////////////////////////////////
 //
@ -129,7 +129,7 @@ IDR_AVSOFFICEPPTXFILE       REGISTRY                "AVSOfficePPTXFile.rgs"

 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSOfficePPTXFile"
+    IDS_PROJNAME            "ASCOfficePPTXFile"
 END

 #endif    // English (U.S.) resources
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile.cpp
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile.cpp
@ -1,13 +0,0 @@
-// AVSOfficePPTXFile.cpp : Implementation of DLL Exports.
-
-#include "stdafx.h"
-#include "resource.h"
-
-#include "AVSOfficePPTXFile.h"
-#include "AVSOfficeDrawingConverter.h"
-
-// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
-[ module(dll, uuid = "{95DEE027-7707-4078-A314-33D35AE842FD}", 
-		 name = "AVSOfficePPTXFile", 
-		 helpstring = "AVSOfficePPTXFile 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICEPPTXFILE") ];
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile.rgs
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile.rgs
@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSOfficePPTXFile'
-		'AVSOfficePPTXFile.DLL'
+		'%APPID%' = s 'ASCOfficePPTXFile'
+		'ASCOfficePPTXFile.DLL'
 		{
 			val AppID = s '%APPID%'
 		}
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile.sln
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile.sln
@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePPTXFile", "AVSOfficePPTXFile.vcproj", "{70078FE7-BE4F-493C-84F3-F98F151587F5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePPTXFile", "ASCOfficePPTXFile.vcproj", "{70078FE7-BE4F-493C-84F3-F98F151587F5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile.vcproj
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficePPTXFile"
+	Name="ASCOfficePPTXFile"
 	ProjectGUID="{70078FE7-BE4F-493C-84F3-F98F151587F5}"
-	RootNamespace="AVSOfficePPTXFile"
+	RootNamespace="ASCOfficePPTXFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@ -44,11 +44,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficePPTXFile.tlb"
+				HeaderFileName="ASCOfficePPTXFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficePPTXFile_i.c"
+				ProxyFileName="ASCOfficePPTXFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -79,15 +79,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
+				OutputFile="$(OutDir)/ASCOfficePPTXFile.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames="LIBC;LIBCD"
 				ModuleDefinitionFile=""
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
+				MergedIDLBaseFileName="_ASCOfficePPTXFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficePPTXFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -146,11 +146,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficePPTXFile.tlb"
+				HeaderFileName="ASCOfficePPTXFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficePPTXFile_i.c"
+				ProxyFileName="ASCOfficePPTXFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -181,15 +181,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
+				OutputFile="$(OutDir)/ASCOfficePPTXFile.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
+				MergedIDLBaseFileName="_ASCOfficePPTXFile.idl"
 				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficePPTXFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -216,7 +216,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="copy $(TargetPath) ..\..\..\Redist\AVSOfficeStudio\AVSOfficePPTXFile.dll"
+				CommandLine="copy $(TargetPath) ..\Redist\ASCOfficePPTXFile.dll"
 			/>
 		</Configuration>
 		<Configuration
@ -248,11 +248,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficePPTXFile.tlb"
+				HeaderFileName="ASCOfficePPTXFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficePPTXFile_i.c"
+				ProxyFileName="ASCOfficePPTXFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@ -283,15 +283,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
+				OutputFile="$(OutDir)/ASCOfficePPTXFile.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
+				MergedIDLBaseFileName="_ASCOfficePPTXFile.idl"
 				GenerateDebugInformation="false"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficePPTXFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -330,11 +330,11 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath=".\AVSOfficeDrawingConverter.cpp"
+				RelativePath=".\ASCOfficeDrawingConverter.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficePPTXFile.cpp"
+				RelativePath=".\ASCOfficePPTXFile.cpp"
 				>
 			</File>
 			<File
@ -371,11 +371,11 @@
 			Filter="h;hpp;hxx;hm;inl;inc"
 			>
 			<File
-				RelativePath=".\AVSOfficeDrawingConverter.h"
+				RelativePath=".\ASCOfficeDrawingConverter.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficePPTXFile.h"
+				RelativePath=".\ASCOfficePPTXFile.h"
 				>
 			</File>
 			<File
@ -392,11 +392,11 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath=".\AVSOfficePPTXFile.rc"
+				RelativePath=".\ASCOfficePPTXFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficePPTXFile.rgs"
+				RelativePath=".\ASCOfficePPTXFile.rgs"
 				>
 			</File>
 		</Filter>
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.sln
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.sln
@ -1,33 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficePPTXFile", "AVSOfficePPTXFile_vs2008.vcproj", "{70078FE7-BE4F-493C-84F3-F98F151587F5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "PPTXFormat\Project\PPTXFormat_vs2008.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		ReleaseASC|Win32 = ReleaseASC|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Debug|Win32.Build.0 = Debug|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Win32.ActiveCfg = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.Release|Win32.Build.0 = Release|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.vcproj
+++ b/ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.vcproj
@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="AVSOfficePPTXFile"
-	ProjectGUID="{70078FE7-BE4F-493C-84F3-F98F151587F5}"
-	RootNamespace="AVSOfficePPTXFile"
-	Keyword="AtlProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Addons\ZLib"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="LIBC;LIBCD"
-				ModuleDefinitionFile=""
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Common;..\..\..\..\Addons\ZLib"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="copy $(TargetPath) ..\..\..\Redist\AVSOfficeStudio\AVSOfficePPTXFile.dll"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseASC|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficePPTXFile.tlb"
-				HeaderFileName="AVSOfficePPTXFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficePPTXFile_i.c"
-				ProxyFileName="AVSOfficePPTXFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Common;..\..\..\..\Addons\ZLib"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG; ASCBUILD"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficePPTXFile.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="LIBC,LIBCMT"
-				MergedIDLBaseFileName="_AVSOfficePPTXFile.idl"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/AVSOfficePPTXFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="copy $(TargetPath) ..\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficePPTXFile.dll"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
-			>
-			<File
-				RelativePath=".\AVSOfficePPTXFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseASC|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc"
-			>
-			<File
-				RelativePath=".\AVSOfficePPTXFile.h"
-				>
-			</File>
-			<File
-				RelativePath="Resource.h"
-				>
-			</File>
-			<File
-				RelativePath="stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath=".\AVSOfficePPTXFile.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\AVSOfficePPTXFile.rgs"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="EditorSource"
-			>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Shapes\BaseShape\BaseShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Elements.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTXShape\Formula.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Layout.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Shapes\BaseShape\PPTXShape\PPTXShape.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\TextAttributesEx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\AVSPresentationEditor\OfficeDrawing\Theme.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="ConverterSimple"
-			>
-			<File
-				RelativePath=".\ConverterSimple\ConverterSimpleHeader.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="ConverterAdvanced"
-			>
-			<File
-				RelativePath=".\ConverterAdvanced\ColorConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\Converter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\FillToBrush.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\LayoutConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\LnToPen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\ShapeConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\SlideConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\Structures.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\TableConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\TextParce.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\TextStyleConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\ThemeConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\TimingConvert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConverterAdvanced\TransitionConvert.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/ASCOfficePPTXFile/Resource.h
+++ b/ASCOfficePPTXFile/Resource.h
@ -4,7 +4,7 @@
 //

 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICEPPTXFILE           101
+#define IDR_ASCOFFICEPPTXFILE           101

 #define IDB_XML_NOTESTHEME				201
 #define IDB_XML_NOTESMASTER				202