Commit aa318b45 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52284 954022d7-b5bf-4e40-9824-e11837661b57
parent 3ffc688f
......@@ -7,8 +7,8 @@
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{30D961A6-9131-48E8-A7D9-3826E3D7818A}",
name = "AVSOfficeTxtFile",
helpstring = "AVSOfficeTxtFile 1.0 Type Library",
name = "ASCOfficeTxtFile",
helpstring = "ASCOfficeTxtFile 1.0 Type Library",
resource_name = "IDR_AVSTXTFILE") ]
class CAVSTxtFileModule
{
......
......@@ -94,7 +94,7 @@ END
// REGISTRY
//
IDR_AVSTXTFILE REGISTRY "AVSOfficeTxtFile.rgs"
IDR_ASCTXTFILE REGISTRY "ASCOfficeTxtFile.rgs"
/////////////////////////////////////////////////////////////////////////////
//
......@@ -111,7 +111,7 @@ IDR_DOCUMENT2 DOCUMENT "Resource\\XmlTemplate.docx"
STRINGTABLE
BEGIN
IDS_PROJNAME "AVSOfficeTxtFile"
IDS_PROJNAME "ASCOfficeTxtFile"
END
#endif // English (U.S.) resources
......
......@@ -2,7 +2,7 @@ HKCR
{
NoRemove AppID
{
'%APPID%' = s 'AVSOfficeTxtFile'
'%APPID%' = s 'ASCOfficeTxtFile'
'AVSTxtFile.DLL'
{
val AppID = s '%APPID%'
......
......@@ -18,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Txt2Docx", "Projects\Txt2Do
{9D3D4B8F-62B8-4029-AF89-EB640DBEEDEE} = {9D3D4B8F-62B8-4029-AF89-EB640DBEEDEE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\AvsDocxFormat\Projects\DocxFormat.vcproj", "{67EB0D73-21A0-44C9-ADB2-109526E60429}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\ASCDocxFormat\Projects\DocxFormat.vcproj", "{67EB0D73-21A0-44C9-ADB2-109526E60429}"
ProjectSection(ProjectDependencies) = postProject
{CF068422-CD0A-484E-B4A9-A0CD108EBBB9} = {CF068422-CD0A-484E-B4A9-A0CD108EBBB9}
{56F6B346-D0EA-4149-88C4-B6D09E0E9BA6} = {56F6B346-D0EA-4149-88C4-B6D09E0E9BA6}
......@@ -26,20 +26,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\Avs
{7D2165DA-B528-4318-A03F-6E922547C09D} = {7D2165DA-B528-4318-A03F-6E922547C09D}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeTxtFile", "AVSOfficeTxtFile.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeTxtFile", "ASCOfficeTxtFile.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
ProjectSection(ProjectDependencies) = postProject
{9D3D4B8F-62B8-4029-AF89-EB640DBEEDEE} = {9D3D4B8F-62B8-4029-AF89-EB640DBEEDEE}
{866414A9-C488-4028-82C8-5343383B331E} = {866414A9-C488-4028-82C8-5343383B331E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\AvsDocxFormat\Projects\XML.vcproj", "{CF068422-CD0A-484E-B4A9-A0CD108EBBB9}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\ASCDocxFormat\Projects\XML.vcproj", "{CF068422-CD0A-484E-B4A9-A0CD108EBBB9}"
ProjectSection(ProjectDependencies) = postProject
{56F6B346-D0EA-4149-88C4-B6D09E0E9BA6} = {56F6B346-D0EA-4149-88C4-B6D09E0E9BA6}
{3C7D3E76-9C62-4D0E-9645-8731700B1D70} = {3C7D3E76-9C62-4D0E-9645-8731700B1D70}
{7A3C0AE1-9FA1-4F56-99C0-139192364F57} = {7A3C0AE1-9FA1-4F56-99C0-139192364F57}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\AvsDocxFormat\Projects\Common.vcproj", "{873D625C-37E4-47C4-8120-2D9FC6A98765}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\ASCDocxFormat\Projects\Common.vcproj", "{873D625C-37E4-47C4-8120-2D9FC6A98765}"
ProjectSection(ProjectDependencies) = postProject
{CF068422-CD0A-484E-B4A9-A0CD108EBBB9} = {CF068422-CD0A-484E-B4A9-A0CD108EBBB9}
{56F6B346-D0EA-4149-88C4-B6D09E0E9BA6} = {56F6B346-D0EA-4149-88C4-B6D09E0E9BA6}
......@@ -47,20 +47,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\AvsDocx
{7A3C0AE1-9FA1-4F56-99C0-139192364F57} = {7A3C0AE1-9FA1-4F56-99C0-139192364F57}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_system", "..\Common\AvsDocxFormat\Projects\boost_system.vcproj", "{7A3C0AE1-9FA1-4F56-99C0-139192364F57}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_system", "..\Common\ASCDocxFormat\Projects\boost_system.vcproj", "{7A3C0AE1-9FA1-4F56-99C0-139192364F57}"
ProjectSection(ProjectDependencies) = postProject
{3C7D3E76-9C62-4D0E-9645-8731700B1D70} = {3C7D3E76-9C62-4D0E-9645-8731700B1D70}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_filesystem", "..\Common\AvsDocxFormat\Projects\boost_filesystem.vcproj", "{3C7D3E76-9C62-4D0E-9645-8731700B1D70}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_filesystem", "..\Common\ASCDocxFormat\Projects\boost_filesystem.vcproj", "{3C7D3E76-9C62-4D0E-9645-8731700B1D70}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\AvsDocxFormat\Projects\Utility.vcproj", "{56F6B346-D0EA-4149-88C4-B6D09E0E9BA6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\ASCDocxFormat\Projects\Utility.vcproj", "{56F6B346-D0EA-4149-88C4-B6D09E0E9BA6}"
ProjectSection(ProjectDependencies) = postProject
{3C7D3E76-9C62-4D0E-9645-8731700B1D70} = {3C7D3E76-9C62-4D0E-9645-8731700B1D70}
{7A3C0AE1-9FA1-4F56-99C0-139192364F57} = {7A3C0AE1-9FA1-4F56-99C0-139192364F57}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\AVSOfficeOdtFile\Source\OfficeSvmFile\OfficeSvmFile.vcproj", "{7D2165DA-B528-4318-A03F-6E922547C09D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\ASCOfficeOdtFile\Source\OfficeSvmFile\OfficeSvmFile.vcproj", "{7D2165DA-B528-4318-A03F-6E922547C09D}"
ProjectSection(ProjectDependencies) = postProject
{3C7D3E76-9C62-4D0E-9645-8731700B1D70} = {3C7D3E76-9C62-4D0E-9645-8731700B1D70}
{7A3C0AE1-9FA1-4F56-99C0-139192364F57} = {7A3C0AE1-9FA1-4F56-99C0-139192364F57}
......
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="AVSOfficeTxtFile"
Name="ASCOfficeTxtFile"
ProjectGUID="{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
RootNamespace="AVSOfficeTxtFile"
RootNamespace="ASCOfficeTxtFile"
Keyword="AtlProj"
TargetFrameworkVersion="196613"
>
......@@ -43,16 +43,16 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSOfficeTxtFile.tlb"
HeaderFileName="AVSOfficeTxtFile.h"
TypeLibraryName="$(IntDir)/ASCOfficeTxtFile.tlb"
HeaderFileName="ASCOfficeTxtFile.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSOfficeTxtFile_i.c"
ProxyFileName="AVSOfficeTxtFile_p.c"
InterfaceIdentifierFileName="ASCOfficeTxtFile_i.c"
ProxyFileName="ASCOfficeTxtFile_p.c"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="Source;.\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source\TxtFormat"
AdditionalIncludeDirectories="Source;.\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source\TxtFormat"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -78,14 +78,14 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
OutputFile="$(OutDir)/AVSOfficeTxtFile.dll"
OutputFile="$(OutDir)/ASCOfficeTxtFile.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=".\..\Common\AvsDocxFormat\Lib\Debug; ..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories=".\..\Common\ASCDocxFormat\Lib\Debug; ..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSOfficeTxtFile.idl"
MergedIDLBaseFileName="_ASCOfficeTxtFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSOfficeTxtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeTxtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -139,15 +139,15 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSOfficeTxtFile.tlb"
HeaderFileName="AVSOfficeTxtFile.h"
TypeLibraryName="$(IntDir)/ASCOfficeTxtFile.tlb"
HeaderFileName="ASCOfficeTxtFile.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSOfficeTxtFile_i.c"
ProxyFileName="AVSOfficeTxtFile_p.c"
InterfaceIdentifierFileName="ASCOfficeTxtFile_i.c"
ProxyFileName="ASCOfficeTxtFile_p.c"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="Source;.\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source\TxtFormat"
AdditionalIncludeDirectories="Source;.\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source\TxtFormat"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
......@@ -171,17 +171,17 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
OutputFile=".\..\..\..\Redist\AVSOfficeStudio\$(ProjectName).dll"
OutputFile=".\..\..\..\Redist\ASCOfficeStudio\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories=".\..\Common\AvsDocxFormat\Lib\Release; ..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories=".\..\Common\ASCDocxFormat\Lib\Release; ..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSOfficeTxtFile.idl"
MergedIDLBaseFileName="_ASCOfficeTxtFile.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSOfficeTxtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeTxtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -218,14 +218,14 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AVSOfficeTxtFile.cpp"
RelativePath=".\ASCOfficeTxtFile.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
<FileConfiguration
......@@ -233,7 +233,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
</File>
......@@ -246,7 +246,7 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
<FileConfiguration
......@@ -255,7 +255,7 @@
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
</File>
......@@ -267,7 +267,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
<FileConfiguration
......@@ -275,7 +275,7 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\Avs\"
ObjectFile="$(IntDir)\ASC\"
/>
</FileConfiguration>
</File>
......@@ -316,11 +316,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\AVSOfficeTxtFile.rc"
RelativePath=".\ASCOfficeTxtFile.rc"
>
</File>
<File
RelativePath=".\AVSOfficeTxtFile.rgs"
RelativePath=".\ASCOfficeTxtFile.rgs"
>
</File>
<File
......
......@@ -34,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Txt2Docx", "Projects\Txt2Do
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\AvsDocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\ASCDocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
ProjectSection(ProjectDependencies) = postProject
{C1587C15-6268-4451-9263-937E63A945F6} = {C1587C15-6268-4451-9263-937E63A945F6}
{918D1327-C6ED-43E6-AE22-84A3736F0E87} = {918D1327-C6ED-43E6-AE22-84A3736F0E87}
......@@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\Avs
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeTxtFile", "AVSOfficeTxtFile2005.vcproj", "{EA304CD3-0CAE-4AD8-AD25-B41735AD7F49}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeTxtFile", "ASCOfficeTxtFile2005.vcproj", "{EA304CD3-0CAE-4AD8-AD25-B41735AD7F49}"
ProjectSection(ProjectDependencies) = postProject
{5C67969B-0950-47B2-B903-18E782AC7CBB} = {5C67969B-0950-47B2-B903-18E782AC7CBB}
{F732FFCC-960B-40D8-A0F3-971465F39948} = {F732FFCC-960B-40D8-A0F3-971465F39948}
......@@ -57,7 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeTxtFile", "AVSOffi
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\AvsDocxFormat\Projects\XML2005.vcproj", "{C1587C15-6268-4451-9263-937E63A945F6}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\ASCDocxFormat\Projects\XML2005.vcproj", "{C1587C15-6268-4451-9263-937E63A945F6}"
ProjectSection(ProjectDependencies) = postProject
{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
EndProjectSection
......@@ -66,7 +66,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\AvsDocxFor
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\AvsDocxFormat\Projects\Common2005.vcproj", "{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\ASCDocxFormat\Projects\Common2005.vcproj", "{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
ProjectSection(ProjectDependencies) = postProject
{C1587C15-6268-4451-9263-937E63A945F6} = {C1587C15-6268-4451-9263-937E63A945F6}
EndProjectSection
......@@ -75,13 +75,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\AvsDocx
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\AvsDocxFormat\Projects\Utility2005.vcproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utility", "..\Common\ASCDocxFormat\Projects\Utility2005.vcproj", "{7B9F3647-32D3-4F82-8CA5-A43E490E1457}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\AVSOfficeOdtFile\Source\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\ASCOfficeOdtFile\Source\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
ProjectSection(ProjectDependencies) = postProject
{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
EndProjectSection
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment