Skip to content

O
onlyoffice_core
Commit 8cc4f562 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52714 954022d7-b5bf-4e40-9824-e11837661b57
parent b5980125
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 85 deletions
ASCOfficeOdtFile/ASCOfficeOdtFile.cpp
View file @ 8cc4f562
// AVSOdtFile.cpp : Implementation of DLL Exports.
// ASCOdtFile.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 = "{E2A541D8-4CC7-40C6-AA18-A033006D8E5A}",
name = "AVSOdtFile",
helpstring = "AVSOdtFile 1.0 Type Library",
resource_name = "IDR_AVSODTFILE") ]
name = "AVSOfficeOdtFile",
helpstring = "ASCOdtFile 1.0 Type Library",
resource_name = "IDR_ASCODTFILE") ]
class CAVSOdtFileModule
{
public:
......
ASCOfficeOdtFile/ASCOfficeOdtFile.rc
View file @ 8cc4f562
......@@ -94,7 +94,7 @@ END
// REGISTRY
//
IDR_AVSODTFILE REGISTRY "AVSOfficeOdtFile.rgs"
IDR_ASCODTFILE REGISTRY "ASCOfficeOdtFile.rgs"
/////////////////////////////////////////////////////////////////////////////
//
......@@ -111,7 +111,7 @@ IDR_DOCUMENT2 DOCUMENT "Resource\\OdtTemplate.odt"
STRINGTABLE
BEGIN
IDS_PROJNAME "AVSOfficeOdtFile"
IDS_PROJNAME "ASCOfficeOdtFile"
END
#endif // Russian resources
......
ASCOfficeOdtFile/ASCOfficeOdtFile.rgs
View file @ 8cc4f562
......@@ -2,8 +2,8 @@ HKCR
{
NoRemove AppID
{
'%APPID%' = s 'AVSOdtFile'
'AVSOdtFile.DLL'
'%APPID%' = s 'ASCOfficeOdtFile'
'ASCOfficeOdtFile.DLL'
{
val AppID = s '%APPID%'
}
......
ASCOfficeOdtFile/ASCOfficeOdtFile.sln
View file @ 8cc4f562

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeOdtFile", "AVSOfficeOdtFile.vcproj", "{FDDA9AAE-7782-4231-8A25-1FBFC56E5E49}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFile", "ASCOfficeOdtFile.vcproj", "{FDDA9AAE-7782-4231-8A25-1FBFC56E5E49}"
ProjectSection(ProjectDependencies) = postProject
{4BDD107C-2392-4DE8-B43B-05B7A1608CD2} = {4BDD107C-2392-4DE8-B43B-05B7A1608CD2}
{E00CC3B1-0B15-497E-9BD4-39E56241E6D3} = {E00CC3B1-0B15-497E-9BD4-39E56241E6D3}
......@@ -27,21 +27,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdtFormat", "Projects\OdtFo
{7D2165DA-B528-4318-A03F-6E922547C09D} = {7D2165DA-B528-4318-A03F-6E922547C09D}
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}
{873D625C-37E4-47C4-8120-2D9FC6A98765} = {873D625C-37E4-47C4-8120-2D9FC6A98765}
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}
......@@ -49,14 +49,14 @@ 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}
......
ASCOfficeOdtFile/ASCOfficeOdtFile.vcproj
View file @ 8cc4f562
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="AVSOfficeOdtFile"
Name="ASCOfficeOdtFile"
ProjectGUID="{FDDA9AAE-7782-4231-8A25-1FBFC56E5E49}"
RootNamespace="AVSOfficeOdtFile"
RootNamespace="ASCOfficeOdtFile"
Keyword="AtlProj"
TargetFrameworkVersion="196613"
>
......@@ -43,16 +43,16 @@
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"
Optimization="0"
AdditionalIncludeDirectories=".\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
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)/AVSOfficeOdtFile.dll"
OutputFile="$(OutDir)/ASCOfficeOdtFile.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -139,15 +139,15 @@
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"
AdditionalIncludeDirectories=".\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
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\$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -218,7 +218,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AVSOfficeOdtFile.cpp"
RelativePath=".\ASCOfficeOdtFile.cpp"
>
</File>
<File
......@@ -282,11 +282,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\AVSOfficeOdtFile.rc"
RelativePath=".\ASCOfficeOdtFile.rc"
>
</File>
<File
RelativePath=".\AVSOfficeOdtFile.rgs"
RelativePath=".\ASCOfficeOdtFile.rgs"
>
</File>
<File
......
ASCOfficeOdtFile/ASCOfficeOdtFile2005.sln
View file @ 8cc4f562

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSOfficeOdtFile", "AVSOfficeOdtFile2005.vcproj", "{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFile", "ASCOfficeOdtFile2005.vcproj", "{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
......@@ -31,7 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdtFormat", "Projects\OdtFo
{399893AA-3617-4CD8-A980-7F15CDAFA3D2} = {399893AA-3617-4CD8-A980-7F15CDAFA3D2}
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(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
......@@ -42,7 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\Avs
{399893AA-3617-4CD8-A980-7F15CDAFA3D2} = {399893AA-3617-4CD8-A980-7F15CDAFA3D2}
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(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
......@@ -51,7 +51,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "..\Common\AvsDocxFor
{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
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(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
......@@ -61,13 +61,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Common\AvsDocx
{7B9F3647-32D3-4F82-8CA5-A43E490E1457} = {7B9F3647-32D3-4F82-8CA5-A43E490E1457}
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}") = "AVSOfficeOdtFileTest", "AVSOfficeOdtFileTest\AVSOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFileTest", "ASCOfficeOdtFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
ProjectSection(WebsiteProperties) = preProject
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.Debug = "False"
......
ASCOfficeOdtFile/ASCOfficeOdtFile2005.vcproj
View file @ 8cc4f562
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="AVSOfficeOdtFile"
Name="ASCOfficeOdtFile"
ProjectGUID="{62C5017E-8246-4FE6-9D5C-A4A95EAA8A09}"
RootNamespace="AVSOfficeOdtFile"
RootNamespace="ASCOfficeOdtFile"
Keyword="AtlProj"
>
<Platforms>
......@@ -42,16 +42,16 @@
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"
Optimization="0"
AdditionalIncludeDirectories=".\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -79,12 +79,12 @@
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="2"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="libcmt.lib"
MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -142,17 +142,17 @@
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"
EnableIntrinsicFunctions="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories=".\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
......@@ -178,15 +178,15 @@
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
OutputFile="$(OutDir)/$(ProjectName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="libcmt.lib"
MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -246,15 +246,15 @@
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"
AdditionalIncludeDirectories=".\..\Common\AvsDocxFormat\Source\Utility;.\..\Common\AvsDocxFormat\Source\XML;.\..\Common\AvsDocxFormat\Source\Common;.\..\Common\AvsDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
......@@ -278,17 +278,17 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="comsvcs.lib comsuppw.lib Msimg32.lib"
OutputFile=".\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeOdtFile.dll"
OutputFile=".\..\Redist\ASCOfficeOdtFile.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\AVSOfficeUtils\ZLIB\zlib123dll\static32"
AdditionalLibraryDirectories="..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="LIBC.lib"
MergedIDLBaseFileName="_AVSOfficeOdtFile.idl"
MergedIDLBaseFileName="_ASCOfficeOdtFile.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSOfficeOdtFile.lib"
ImportLibrary="$(OutDir)/ASCOfficeOdtFile.lib"
TargetMachine="1"
/>
<Tool
......@@ -328,7 +328,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AVSOfficeOdtFile.cpp"
RelativePath=".\ASCOfficeOdtFile.cpp"
>
</File>
<File
......@@ -396,11 +396,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\AVSOfficeOdtFile.rc"
RelativePath=".\ASCOfficeOdtFile.rc"
>
</File>
<File
RelativePath=".\AVSOfficeOdtFile.rgs"
RelativePath=".\ASCOfficeOdtFile.rgs"
>
</File>
<File
......
ASCOfficeOdtFile/ASCOfficeOdtFileTest/ASCOfficeOdfFileTest.vcproj
View file @ 8cc4f562
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="AVSOfficeOdtFileTest"
Name="ASCOfficeOdtFileTest"
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=".\AVSOfficeOdtFileTest.cpp"
RelativePath=".\ASCOfficeOdtFileTest.cpp"
>
</File>
<File
......
ASCOfficeOdtFile/ASCOfficeOdtFileTest/ASCOfficeOdtFileTest.cpp
View file @ 8cc4f562
// AVSOfficeOdfFileTest.cpp : Defines the entry point for the console application.
// ASCOfficeOdfFileTest.cpp : Defines the entry point for the console application.
//
#include "stdafx.h"
......
ASCOfficeOdtFile/OdtFile.cpp
View file @ 8cc4f562
......@@ -21,9 +21,9 @@
#include "Resource.h"
#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
......
ASCOfficeOdtFile/OdtFile.h
View file @ 8cc4f562
#pragma once
#include "resource.h" // main symbols
#include <string>
#include <./../AVSOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h>
#include <./../ASCOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h>
#include "./../Common/OfficeFileTemplate.h"
#include "./../Common/OfficeFileErrorDescription.h"
#include "OdtEvent.h"
......@@ -14,9 +14,9 @@
#ifdef _DEBUG
#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeUtils.dll" raw_interfaces_only
#import "..\Redist\ASCOfficeUtils.dll" raw_interfaces_only
#else
#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeUtils.dll" raw_interfaces_only
#import "..\Redist\ASCOfficeUtils.dll" raw_interfaces_only
#endif
/*
......
ASCOfficeOdtFile/Resource.h
View file @ 8cc4f562
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by AVSOfficeOdtFile.rc
// Used by ASCOfficeOdtFile.rc
//
#define IDS_PROJNAME 100
#define IDR_AVSODTFILE 101
#define IDR_ASCODTFILE 101
#define IDR_DOCUMENT1 201
#define IDR_DOCUMENT2 202
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7