git-svn-id:...

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

.gitattributes

@@ -344,6 +344,7 @@ Redist/ASCOfficeDocxRenderer.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeEpubFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeFB2File.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeHtmlFile.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCOfficeOdfFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeOdpFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFReader.dll svn_mime_002dtype=application%2Foctet-stream

ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.cpp

-// AVSOfficeOdfFile.cpp : Implementation of DLL Exports.
+// ASCOfficeOdfFile.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -7,9 +7,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{9AEF1F19-91CE-46C0-A380-06A7F56CE4AE}", 
-		 name = "AVSOfficeOdfFile", 
-		 helpstring = "AVSOfficeOdfFile 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICEODFFILE") ]
+		 name = "ASCOfficeOdfFile", 
+		 helpstring = "ASCOfficeOdfFile 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICEODFFILE") ]
 class CAVSOfficeOdfFileModule
 {
 public:

ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeOdfFile"
-#include "..\..\..\..\..\Common\FileInfo.h"
+#include "..\..\Common\FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -86,10 +86,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSOfficeOdfFile"
+	IDS_PROJNAME					"ASCOfficeOdfFile"
 END
 
-IDR_AVSOFFICEODFFILE REGISTRY "AVSOfficeOdfFile.rgs"
+IDR_ASCOFFICEODFFILE REGISTRY "ASCOfficeOdfFile.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.rgs

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

ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeOdfFile"
+	Name="ASCOfficeOdfFile"
 	ProjectGUID="{64B09C98-22DC-494E-A882-9E2D7D18557C}"
-	RootNamespace="AVSOfficeOdfFile"
+	RootNamespace="ASCOfficeOdfFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -42,11 +42,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeOdfFile.tlb"
-				HeaderFileName="AVSOfficeOdfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
+				HeaderFileName="ASCOfficeOdfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeOdfFile_i.c"
-				ProxyFileName="AVSOfficeOdfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
+				ProxyFileName="ASCOfficeOdfFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -77,14 +77,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="XmlLite.lib Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficeOdfFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
 				IgnoreDefaultLibraryNames="libcmt.lib"
-				MergedIDLBaseFileName="_AVSOfficeOdfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficeOdfFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -111,7 +111,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../../Redist&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -144,11 +144,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeOdfFile.tlb"
-				HeaderFileName="AVSOfficeOdfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
+				HeaderFileName="ASCOfficeOdfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeOdfFile_i.c"
-				ProxyFileName="AVSOfficeOdfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
+				ProxyFileName="ASCOfficeOdfFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -173,22 +173,22 @@
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="D:\WORK\VersionControl.exe $(ProjectDir)\version.h"
+				CommandLine="../../Redist/VersionControl.exe $(ProjectDir)\version.h"
 			/>
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="XmlLite.lib Msimg32.lib"
-				OutputFile="$(OutDir)/AVSOfficeOdfFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)bin"
 				IgnoreDefaultLibraryNames="libcmt.lib"
-				MergedIDLBaseFileName="_AVSOfficeOdfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeOdfFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -230,7 +230,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="x:\AVS\Redist\VersionControl.exe $(ProjectDir)\version.h"
+				CommandLine="../../Redist/VersionControl.exe $(ProjectDir)\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -247,11 +247,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeOdfFile.tlb"
-				HeaderFileName="AVSOfficeOdfFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
+				HeaderFileName="ASCOfficeOdfFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeOdfFile_i.c"
-				ProxyFileName="AVSOfficeOdfFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
+				ProxyFileName="ASCOfficeOdfFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -284,12 +284,12 @@
 				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)bin"
-				MergedIDLBaseFileName="_AVSOfficeOdfFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeOdfFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -329,7 +329,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeOdfFile.cpp"
+				RelativePath=".\ASCOfficeOdfFile.cpp"
 				>
 			</File>
 			<File
@@ -369,11 +369,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeOdfFile.rc"
+				RelativePath=".\ASCOfficeOdfFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeOdfFile.rgs"
+				RelativePath=".\ASCOfficeOdfFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeODFFile/ASCOfficeOdfFile/OfficeOdfFile.cpp

@@ -27,9 +27,9 @@
 #pragma comment(lib, "cpcommon-static.lib")
 
 #ifdef _DEBUG
-	#pragma comment(lib, "..\\..\\..\\AVSImageStudio3\\AVSGraphics\\OfficeSvmFile\\Debug\\OfficeSvmFile.lib")
+	#pragma comment(lib, "../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Debug/OfficeSvmFile.lib")
 #else
-	#pragma comment(lib, "..\\..\\..\\AVSImageStudio3\\AVSGraphics\\OfficeSvmFile\\Release\\OfficeSvmFile.lib")
+	#pragma comment(lib, "../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Release/OfficeSvmFile.lib")
 #endif
 
 // :     1   ,      xlsx  docx

ASCOfficeODFFile/ASCOfficeOdfFile/OfficeOdfFile.h

@@ -4,7 +4,8 @@
 #include "resource.h"       // main symbols
 #include <string>
 
-#import "libid:92F87FA9-D3C2-4820-82F6-DEAEC0A3539D" rename_namespace("AVSOfficeUtils"), raw_interfaces_only
+//#import "libid:92F87FA9-D3C2-4820-82F6-DEAEC0A3539D" rename_namespace("AVSOfficeUtils"), raw_interfaces_only
+#import "../../Redist/ASCOfficeUtils.dll" rename_namespace("AVSOfficeUtils"), raw_interfaces_only
 
 ////////////////////////////////////////////////////////////////
 // IAVSOfficeFileTemplate

ASCOfficeODFFile/ASCOfficeOdfFile/ReadMe.txt

 ========================================================================
-    ACTIVE TEMPLATE LIBRARY : AVSOfficeOdfFile Project Overview
+    ACTIVE TEMPLATE LIBRARY : ASCOfficeOdfFile Project Overview
 ========================================================================
 
-AppWizard has created this AVSOfficeOdfFile project for you to use as the starting point for
+AppWizard has created this ASCOfficeOdfFile project for you to use as the starting point for
 writing your Dynamic Link Library (DLL).
 
 This project is implemented with Visual C++ attributes.
@@ -10,29 +10,29 @@ This project is implemented with Visual C++ attributes.
 This file contains a summary of what you will find in each of the files that
 make up your project.
 
-AVSOfficeOdfFile.vcproj
+ASCOfficeOdfFile.vcproj
     This is the main project file for VC++ projects generated using an Application Wizard. 
     It contains information about the version of Visual C++ that generated the file, and 
     information about the platforms, configurations, and project features selected with the
     Application Wizard.
 
-_AVSOfficeOdfFile.idl
+_ASCOfficeOdfFile.idl
     This file will be generated by the compiler when the project is built. It will contain the IDL 
     definitions of the type library, the interfaces and co-classes defined in your project.
     This file will be processed by the MIDL compiler to generate:
-        C++ interface definitions and GUID declarations (_AVSOfficeOdfFile.h)
-        GUID definitions                                (_AVSOfficeOdfFile_i.c)
-        A type library                                  (_AVSOfficeOdfFile.tlb)
-        Marshaling code                                 (_AVSOfficeOdfFile_p.c and dlldata.c)
+        C++ interface definitions and GUID declarations (_ASCOfficeOdfFile.h)
+        GUID definitions                                (_ASCOfficeOdfFile_i.c)
+        A type library                                  (_ASCOfficeOdfFile.tlb)
+        Marshaling code                                 (_ASCOfficeOdfFile_p.c and dlldata.c)
 
-AVSOfficeOdfFile.cpp
+ASCOfficeOdfFile.cpp
     This file contains the object map and the implementation of your DLL's exports.
 
-AVSOfficeOdfFile.rc
+ASCOfficeOdfFile.rc
     This is a listing of all of the Microsoft Windows resources that the
     program uses.
 
-AVSOfficeOdfFile.def
+ASCOfficeOdfFile.def
     This module-definition file provides the linker with information about the exports
     required by your DLL. It contains exports for:
         DllGetClassObject  
@@ -46,7 +46,7 @@ Other standard files:
 
 StdAfx.h, StdAfx.cpp
     These files are used to build a precompiled header (PCH) file
-    named AVSOfficeOdfFile.pch and a precompiled types file named StdAfx.obj.
+    named ASCOfficeOdfFile.pch and a precompiled types file named StdAfx.obj.
 
 Resource.h
     This is the standard header file that defines resource IDs.
@@ -54,14 +54,14 @@ Resource.h
 /////////////////////////////////////////////////////////////////////////////
 Proxy/stub DLL project and module definition file:
 
-AVSOfficeOdfFileps.vcproj
+ASCOfficeOdfFileps.vcproj
     This file is the project file for building a proxy/stub DLL if necessary.
 	The IDL file in the main project must contain at least one interface and you must 
 	first compile the IDL file before building the proxy/stub DLL.	This process generates
-	dlldata.c, AVSOfficeOdfFile_i.c and AVSOfficeOdfFile_p.c which are required
+	dlldata.c, ASCOfficeOdfFile_i.c and ASCOfficeOdfFile_p.c which are required
 	to build the proxy/stub DLL.
 
-AVSOfficeOdfFileps.def
+ASCOfficeOdfFileps.def
     This module definition file provides the linker with information about the exports
     required by the proxy/stub.
 

ASCOfficeODFFile/ASCOfficeOdfFile/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSOfficeOdfFile.rc
+// Used by ASCOfficeOdfFile.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICEODFFILE	101
+#define IDR_ASCOFFICEODFFILE	101
 
 // Next default values for new objects
 // 

ASCOfficeODFFile/ASCOfficeOdtFile/ASCOfficeOdtFile.cpp

-// AVSOfficeOdtFile.cpp : Implementation of DLL Exports.
+// ASCOfficeOdtFile.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -7,9 +7,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{C20747BB-3DD7-4D1E-9611-DE0E693B6554}", 
-		 name = "AVSOfficeOdtFile", 
-		 helpstring = "AVSOfficeOdtFile 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICEODTFILE") ]
+		 name = "ASCOfficeOdtFile", 
+		 helpstring = "ASCOfficeOdtFile 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICEODTFILE") ]
 class CAVSOfficeOdtFileModule
 {
 public:

ASCOfficeODFFile/ASCOfficeOdtFile/ASCOfficeOdtFile.rc

@@ -8,7 +8,9 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winres.h"
-
+#define COMPONENT_NAME "OfficeOdtFile"
+#include "../../Common/FileInfo.h"
+#include "version.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -42,8 +44,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,1
- PRODUCTVERSION 2,0,0,1
+ FILEVERSION INTVER
+ PRODUCTVERSION INTVER
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -56,22 +58,21 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041904e3"
+        BLOCK "040904B0"
         BEGIN
-            VALUE "CompanyName", "TODO: <Company name>"
-            VALUE "FileDescription", "TODO: <File description>"
-            VALUE "FileVersion", "2.0.0.1"
-            VALUE "LegalCopyright", "TODO: (c) <Company name>.  All rights reserved."
-            VALUE "InternalName", "AVSOfficeOdtFile.dll"
-            VALUE "OriginalFilename", "AVSOfficeOdtFile.dll"
-            VALUE "ProductName", "TODO: <Product name>"
-            VALUE "ProductVersion", "2.0.0.1"
-            VALUE "OLESelfRegister", ""
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX
+            VALUE "FileVersion", STRVER
+            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
+            VALUE "LegalCopyright", 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, 0x04B0
     END
 END
 
@@ -84,10 +85,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSOfficeOdtFile"
+	IDS_PROJNAME					"ASCOfficeOdtFile"
 END
 
-IDR_AVSOFFICEODTFILE REGISTRY "AVSOfficeOdtFile.rgs"
+IDR_ASCOFFICEODTFILE REGISTRY "ASCOfficeOdtFile.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCOfficeODFFile/ASCOfficeOdtFile/ASCOfficeOdtFile.rgs

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

ASCOfficeODFFile/ASCOfficeOdtFile/ASCOfficeOdtFile.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeOdtFile"
+	Name="ASCOfficeOdtFile"
 	ProjectGUID="{A2EB9389-498F-485D-8426-EDF788304615}"
-	RootNamespace="AVSOfficeOdtFile"
+	RootNamespace="ASCOfficeOdtFile"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -42,11 +42,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeOdtFile.tlb"
-				HeaderFileName="AVSOfficeOdtFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdtFile.tlb"
+				HeaderFileName="ASCOfficeOdtFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeOdtFile_i.c"
-				ProxyFileName="AVSOfficeOdtFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeOdtFile_i.c"
+				ProxyFileName="ASCOfficeOdtFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -75,12 +75,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSOfficeOdtFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeOdtFile.dll"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -137,11 +137,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSOfficeOdtFile.tlb"
-				HeaderFileName="AVSOfficeOdtFile.h"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdtFile.tlb"
+				HeaderFileName="ASCOfficeOdtFile.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSOfficeOdtFile_i.c"
-				ProxyFileName="AVSOfficeOdtFile_p.c"
+				InterfaceIdentifierFileName="ASCOfficeOdtFile_i.c"
+				ProxyFileName="ASCOfficeOdtFile_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -167,14 +167,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSOfficeOdtFile.dll"
+				OutputFile="$(OutDir)/ASCOfficeOdtFile.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
+				MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
+				ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -214,7 +214,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeOdtFile.cpp"
+				RelativePath=".\ASCOfficeOdtFile.cpp"
 				>
 			</File>
 			<File
@@ -266,11 +266,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSOfficeOdtFile.rc"
+				RelativePath=".\ASCOfficeOdtFile.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSOfficeOdtFile.rgs"
+				RelativePath=".\ASCOfficeOdtFile.rgs"
 				>
 			</File>
 		</Filter>

ASCOfficeODFFile/examples/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.cpp

-// AVSOfficeOdfFileTest.cpp : Defines the entry point for the console application.
+// ASCOfficeOdfFileTest.cpp : Defines the entry point for the console application.
 //
 
 #include "stdafx.h"

ASCOfficeODFFile/examples/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSOfficeOdfFileTest"
+	Name="ASCOfficeOdfFileTest"
 	ProjectGUID="{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
-	RootNamespace="AVSOfficeOdfFileTest"
+	RootNamespace="ASCOfficeOdfFileTest"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -177,7 +177,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSOfficeOdfFileTest.cpp"
+				RelativePath=".\ASCOfficeOdfFileTest.cpp"
 				>
 			</File>
 			<File

ASCOfficeODFFile/examples/ASCOfficeOdfFileTest/ReadMe.txt

 ========================================================================
-    CONSOLE APPLICATION : AVSOfficeOdfFileTest Project Overview
+    CONSOLE APPLICATION : ASCOfficeOdfFileTest Project Overview
 ========================================================================
 
-AppWizard has created this AVSOfficeOdfFileTest application for you.  
+AppWizard has created this ASCOfficeOdfFileTest application for you.  
 
 This file contains a summary of what you will find in each of the files that
-make up your AVSOfficeOdfFileTest application.
+make up your ASCOfficeOdfFileTest application.
 
 
-AVSOfficeOdfFileTest.vcproj
+ASCOfficeOdfFileTest.vcproj
     This is the main project file for VC++ projects generated using an Application Wizard. 
     It contains information about the version of Visual C++ that generated the file, and 
     information about the platforms, configurations, and project features selected with the
     Application Wizard.
 
-AVSOfficeOdfFileTest.cpp
+ASCOfficeOdfFileTest.cpp
     This is the main application source file.
 
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ Other standard files:
 
 StdAfx.h, StdAfx.cpp
     These files are used to build a precompiled header (PCH) file
-    named AVSOfficeOdfFileTest.pch and a precompiled types file named StdAfx.obj.
+    named ASCOfficeOdfFileTest.pch and a precompiled types file named StdAfx.obj.
 
 /////////////////////////////////////////////////////////////////////////////
 Other notes:

ASCOfficeODFFile/src/docx/oox_package.cpp

@@ -9,7 +9,7 @@
 
 #include "mediaitems.h"
 
-#include "..\..\..\..\AVSImageStudio3\AVSGraphics\OfficeSvmFile\SvmConverter.h"
+#include "..\..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\SvmConverter.h"
 
 namespace cpdoccore { 
 namespace oox {