Skip to content

O
onlyoffice_core
Commit 357b166d authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52603 954022d7-b5bf-4e40-9824-e11837661b57
parent d7d9c695
Expand all Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 566 deletions
ASCOfficePPTXFile/AVSOfficeDrawingConverter.cpp → ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @ 357b166d
#include "stdafx.h"
#include "AVSOfficeDrawingConverter.h"
#include "ASCOfficeDrawingConverter.h"
#include "./PPTXFormat/Logic/SpTreeElem.h"
#include "./PPTXFormat/Logic/Shape.h"
......
ASCOfficePPTXFile/AVSOfficePPTXFile.cpp → ASCOfficePPTXFile/ASCOfficePPTXFile.cpp
View file @ 357b166d
// AVSOfficePPTXFile.cpp : Implementation of DLL Exports.
//ASCOfficePPTXFile.cpp : Implementation of DLL Exports.
#include "stdafx.h"
#include "resource.h"
#include "AVSOfficePPTXFile.h"
#include "AVSOfficeDrawingConverter.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 = "AVSOfficePPTXFile",
helpstring = "AVSOfficePPTXFile 1.0 Type Library",
resource_name = "IDR_AVSOFFICEPPTXFILE") ];
name = "ASCOfficePPTXFile",
helpstring = "ASCOfficePPTXFile 1.0 Type Library",
resource_name = "IDR_ASCOFFICEPPTXFILE") ];
ASCOfficePPTXFile/AVSOfficePPTXFile.rc → ASCOfficePPTXFile/ASCOfficePPTXFile.rc
View file @ 357b166d
......@@ -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
......
ASCOfficePPTXFile/AVSOfficePPTXFile.rgs
View file @ 357b166d
......@@ -2,8 +2,8 @@ HKCR
{
NoRemove AppID
{
'%APPID%' = s 'AVSOfficePPTXFile'
'AVSOfficePPTXFile.DLL'
'%APPID%' = s 'ASCOfficePPTXFile'
'ASCOfficePPTXFile.DLL'
{
val AppID = s '%APPID%'
}
......
ASCOfficePPTXFile/AVSOfficePPTXFile.sln
View file @ 357b166d
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
......
ASCOfficePPTXFile/AVSOfficePPTXFile.vcproj
View file @ 357b166d
......@@ -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>
......
ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.sln deleted 100644 → 0
View file @ d7d9c695
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
ASCOfficePPTXFile/AVSOfficePPTXFile_vs2008.vcproj deleted 100644 → 0
View file @ d7d9c695
This diff is collapsed.
ASCOfficePPTXFile/Resource.h
View file @ 357b166d
......@@ -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
......
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