Skip to content

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

(1.0.0.7) ASC version 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52372 954022d7-b5bf-4e40-9824-e11837661b57
parent 4ef3eb63
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 528 deletions
ASCFontConverter/AVSFontConverter.cpp → ASCFontConverter/ASCFontConverter.cpp
View file @ 471bad9d
// AVSFontConverter.cpp : Implementation of DLL Exports.
// ASCFontConverter.cpp : Implementation of DLL Exports.
#include "stdafx.h"
#include "resource.h"
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{0F344B85-C7D3-483A-BA29-3ABFD701ADD0}",
name = "AVSFontConverter",
helpstring = "AVSFontConverter 1.0 Type Library",
resource_name = "IDR_AVSFONTCONVERTER") ]
class CAVSFontConverterModule
name = "ASCFontConverter",
helpstring = "ASCFontConverter 1.0 Type Library",
resource_name = "IDR_ASCFONTCONVERTER") ]
class CASCFontConverterModule
{
public:
// Override CAtlDllModuleT members
......
ASCFontConverter/AVSFontConverter.rc → ASCFontConverter/ASCFontConverter.rc
View file @ 471bad9d
......@@ -2,7 +2,7 @@
//
#include "resource.h"
#define COMPONENT_NAME "FontConverter"
#include "../../../../Common/FileInfo.h"
#include "../Common/FileInfo.h"
#include "version.h"
#define APSTUDIO_READONLY_SYMBOLS
......@@ -86,10 +86,10 @@ END
STRINGTABLE
BEGIN
IDS_PROJNAME "AVSFontConverter"
IDS_PROJNAME "ASCFontConverter"
END
IDR_AVSFONTCONVERTER REGISTRY "AVSFontConverter.rgs"
IDR_ASCFONTCONVERTER REGISTRY "ASCFontConverter.rgs"
////////////////////////////////////////////////////////////////////////////
......
ASCFontConverter/AVSFontConverter.rgs → ASCFontConverter/ASCFontConverter.rgs
View file @ 471bad9d
......@@ -2,8 +2,8 @@ HKCR
{
NoRemove AppID
{
'%APPID%' = s 'AVSFontConverter'
'AVSFontConverter.DLL'
'%APPID%' = s 'ASCFontConverter'
'ASCFontConverter.DLL'
{
val AppID = s '%APPID%'
}
......
ASCFontConverter/AVSFontConverter.sln → ASCFontConverter/ASCFontConverter.sln
View file @ 471bad9d

Microsoft Visual Studio Solution File, Format Version 10.00
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSFontConverter", "AVSFontConverter.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCFontConverter", "ASCFontConverter.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCFontConverter/AVSFontConverter.vcproj → ASCFontConverter/ASCFontConverter.vcproj
View file @ 471bad9d
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="AVSFontConverter"
Version="8,00"
Name="ASCFontConverter"
ProjectGUID="{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
Keyword="AtlProj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
......@@ -42,15 +41,16 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
HeaderFileName="AVSFontConverter.h"
TypeLibraryName="$(IntDir)/ASCFontConverter.tlb"
HeaderFileName="ASCFontConverter.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSFontConverter_i.c"
ProxyFileName="AVSFontConverter_p.c"
InterfaceIdentifierFileName="ASCFontConverter_i.c"
ProxyFileName="ASCFontConverter_p.c"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -75,12 +75,12 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSFontConverter.dll"
OutputFile="$(OutDir)/ASCFontConverter.dll"
LinkIncremental="2"
MergedIDLBaseFileName="_AVSFontConverter.idl"
MergedIDLBaseFileName="_ASCFontConverter.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSFontConverter.lib"
ImportLibrary="$(OutDir)/ASCFontConverter.lib"
TargetMachine="1"
/>
<Tool
......@@ -101,6 +101,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
......@@ -118,7 +121,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
CommandLine="..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -135,14 +138,15 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
HeaderFileName="AVSFontConverter.h"
TypeLibraryName="$(IntDir)/ASCFontConverter.tlb"
HeaderFileName="ASCFontConverter.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSFontConverter_i.c"
ProxyFileName="AVSFontConverter_p.c"
InterfaceIdentifierFileName="ASCSFontConverter_i.c"
ProxyFileName="ASCFontConverter_p.c"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
......@@ -165,15 +169,15 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="true"
OutputFile="../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"
OutputFile="../Redist/ASCFontConverter.dll"
LinkIncremental="1"
MergedIDLBaseFileName="_AVSFontConverter.idl"
MergedIDLBaseFileName="_ASCFontConverter.idl"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSFontConverter.lib"
ImportLibrary="$(OutDir)/ASCFontConverter.lib"
TargetMachine="1"
/>
<Tool
......@@ -194,6 +198,9 @@
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
......@@ -210,13 +217,33 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\AVSFontConverter.cpp"
RelativePath=".\ASCFontConverter.cpp"
>
</File>
<File
RelativePath=".\FontConverter.cpp"
>
</File>
<File
RelativePath=".\FontFileEncodings.cpp"
>
</File>
<File
RelativePath=".\FontFileTrueType.cpp"
>
</File>
<File
RelativePath=".\FontFileType1.cpp"
>
</File>
<File
RelativePath=".\FontFileType1C.cpp"
>
</File>
<File
RelativePath=".\Hash.cpp"
>
</File>
<File
RelativePath=".\stdafx.cpp"
>
......@@ -237,6 +264,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\StringExt.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
......@@ -266,11 +297,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\AVSFontConverter.rc"
RelativePath=".\ASCFontConverter.rc"
>
</File>
<File
RelativePath=".\AVSFontConverter.rgs"
RelativePath=".\ASCFontConverter.rgs"
>
</File>
</Filter>
......
ASCFontConverter/AVSFontConverter_vs2005.sln deleted 100644 → 0
View file @ 4ef3eb63
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSFontConverter", "AVSFontConverter_vs2005.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
ReleaseASC|Win32 = ReleaseASC|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Debug|Win32.ActiveCfg = Debug|Win32
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Debug|Win32.Build.0 = Debug|Win32
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Release|Win32.ActiveCfg = Release|Win32
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Release|Win32.Build.0 = Release|Win32
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
ASCFontConverter/AVSFontConverter_vs2005.vcproj deleted 100644 → 0
View file @ 4ef3eb63
This diff is collapsed.
ASCFontConverter/Resource.h
View file @ 471bad9d
......@@ -4,7 +4,7 @@
//
#define IDS_PROJNAME 100
#define IDR_AVSFONTCONVERTER 101
#define IDR_ASCFONTCONVERTER 101
// Next default values for new objects
//
......
ASCFontConverter/stdafx.h
View file @ 471bad9d
......@@ -47,8 +47,5 @@
#include <ft2build.h>
#include FT_FREETYPE_H
//#ifdef _VS_2005
#pragma comment (lib, "..\\..\\AVSImageStudio3\\AVSGraphics\\Objects\\Font\\FreeType\\freetype242_vs2005.lib")
#pragma comment (lib, "../OfficeCore/Fonts/FreeType/freetype242_vs2005.lib")
using namespace ATL;
\ No newline at end of file
ASCFontConverter/version.h
View file @ 471bad9d
......@@ -2,6 +2,6 @@
//1
//0
//0
//6
#define INTVER 1,0,0,6
#define STRVER "1,0,0,6\0"
//7
#define INTVER 1,0,0,7
#define STRVER "1,0,0,7\0"
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