pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

(2.1.0.133): ASCOfficeHtmlFile

Browse Source 
исправление AVS -> ASC

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53704 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2014-01-20 13:13:19 +00:00
committed by Alexander Trofimov
parent 00aaa266eb
commit 66b7abd8f1
10 changed files with 133 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ASCOfficeHtmlFile/ASCOfficeHtmlFile/prj/ASCOfficeHtmlFile2005.vcproj
View File

@ -128,7 +128,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)\..\res\version.h"
CommandLine="encrypt.bat&#x0D;&#x0A;..\..\..\Redist\VersionControl.exe $(ProjectDir)\..\res\version.h"
/>
<Tool
Name="VCCustomBuildTool"
@ -154,7 +154,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\res;..\include;..\..\..\Common;..\prj;..\HTMLReaderLib"
AdditionalIncludeDirectories=".\..\res;..\include;..\..\..\Common;..\prj;..\HTMLReaderLib;.\res"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
@ -594,6 +594,33 @@
<File
RelativePath="..\res\ASCOfficeHtmlFile.rc"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCResourceCompilerTool"
Culture="1033"
AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;D:\WORK\AVS\Sources\TeamlabOffice\trunk\ServerComponents\ASCOfficeHtmlFile\ASCOfficeHtmlFile\res"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCResourceCompilerTool"
Culture="1033"
AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;.\..\res;D:\WORK\AVS\Sources\TeamlabOffice\trunk\ServerComponents\ASCOfficeHtmlFile\ASCOfficeHtmlFile\res"
/>
</FileConfiguration>
<FileConfiguration
Name="ReleaseASC|Win32"
>
<Tool
Name="VCResourceCompilerTool"
Culture="1033"
AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;D:\WORK\AVS\Sources\TeamlabOffice\trunk\ServerComponents\ASCOfficeHtmlFile\ASCOfficeHtmlFile\res"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\res\ASCOfficeHtmlFile.rgs"

2
ASCOfficeHtmlFile/ASCOfficeHtmlFile/prj/encrypt.bat
View File

@ -1,3 +1,3 @@
for %%a in (.\..\res\XSL\*.xsl) do .\..\..\..\..\..\Redist\AVSOfficeStudio\EncryptRes.exe -e %%a
for %%a in (.\..\res\XSL\*.xsl) do .\..\..\..\Redist\EncryptRes.exe -e %%a
pause

35
ASCOfficeHtmlFile/ASCOfficeHtmlFile/res/ASCOfficeHtmlFile.rc
View File

@ -18,19 +18,23 @@
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// Russian resources
////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
#pragma code_page(1251)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// CRPT
// REGISTRY
//
IDR_ASCHTMLFILE REGISTRY "ASCOfficeHtmlFile.rgs"
///////////////////////////////////////////////////////////////////////////////
IDR_CRPT1 CRPT "xsl\\2htm-comments.crpt"
IDR_CRPT2 CRPT "xsl\\2htm-common.crpt"
IDR_CRPT3 CRPT "xsl\\2htm-content.crpt"
@ -70,25 +74,8 @@ IDR_CRPT36 CRPT "xsl\\2oox-measures.crpt"
IDR_CRPT37 CRPT "xsl\\2oox-styles-common.crpt"
IDR_CRPT38 CRPT "xsl\\2oox-numbering.crpt"
IDR_CRPT39 CRPT "xsl\\html2xhtml.crpt"
#endif // Russian resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// REGISTRY
//
IDR_ASCHTMLFILE REGISTRY "ASCOfficeHtmlFile.rgs"
/////////////////////////////////////////////////////////////////////////////////////////////////
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////

243
ASCOfficeHtmlFile/ASCOfficeHtmlFile/res/Resource.h
View File

@ -5,87 +5,46 @@
#define IDS_PROJNAME 100
#define IDR_ASCHTMLFILE 101
#define IDR_HTMLFILE 102
/*
#define IDR_XSL1 201
#define IDR_XSL2 202
#define IDR_XSL3 203
#define IDR_XSL4 204
#define IDR_XSL5 205
#define IDR_XSL6 206
#define IDR_XSL7 207
#define IDR_XSL8 208
#define IDR_XSL9 209
#define IDR_XSL10 210
#define IDR_XSL11 211
#define IDR_XSL12 212
#define IDR_XSL13 213
#define IDR_XSL14 214
#define IDR_XSL15 215
#define IDR_XSL16 216
#define IDR_XSL17 217
#define IDR_XSL18 218
#define IDR_XSL19 219
#define IDR_XSL20 220
#define IDR_XSL21 221
#define IDR_XSL22 222
#define IDR_XSL23 223
#define IDR_XSL24 224
#define IDR_XSL25 225
#define IDR_XSL26 226
#define IDR_XSL27 227
#define IDR_XSL28 228
#define IDR_XSL29 229
#define IDR_XSL30 230
#define IDR_XSL31 231
#define IDR_XSL32 232
#define IDR_XSL33 233
#define IDR_XSL34 234
#define IDR_XSL35 235
#define IDR_XSL36 236
#define IDR_XSL37 237
#define IDR_XSL38 238
#define IDR_XSL39 239
*/
#define IDR_CRPT1 201
#define IDR_CRPT2 202
#define IDR_CRPT3 203
#define IDR_CRPT4 204
#define IDR_CRPT5 205
#define IDR_CRPT6 206
#define IDR_CRPT7 207
#define IDR_CRPT8 208
#define IDR_CRPT9 209
#define IDR_CRPT10 210
#define IDR_CRPT11 211
#define IDR_CRPT12 212
#define IDR_CRPT13 213
#define IDR_CRPT14 214
#define IDR_CRPT15 215
#define IDR_CRPT16 216
#define IDR_CRPT17 217
#define IDR_CRPT18 218
#define IDR_CRPT19 219
#define IDR_CRPT20 220
#define IDR_CRPT21 221
#define IDR_CRPT22 222
#define IDR_CRPT23 223
#define IDR_CRPT24 224
#define IDR_CRPT25 225
#define IDR_CRPT26 226
#define IDR_CRPT27 227
#define IDR_CRPT28 228
#define IDR_CRPT29 229
#define IDR_CRPT30 230
#define IDR_CRPT31 231
#define IDR_CRPT32 232
#define IDR_CRPT33 233
#define IDR_CRPT34 234
#define IDR_CRPT35 235
#define IDR_CRPT36 236
#define IDR_CRPT37 237
#define IDR_CRPT38 238
#define IDR_CRPT39 239
#define IDR_CRPT1 201
#define IDR_CRPT2 202
#define IDR_CRPT3 203
#define IDR_CRPT4 204
#define IDR_CRPT5 205
#define IDR_CRPT6 206
#define IDR_CRPT7 207
#define IDR_CRPT8 208
#define IDR_CRPT9 209
#define IDR_CRPT10 210
#define IDR_CRPT11 211
#define IDR_CRPT12 212
#define IDR_CRPT13 213
#define IDR_CRPT14 214
#define IDR_CRPT15 215
#define IDR_CRPT16 216
#define IDR_CRPT17 217
#define IDR_CRPT18 218
#define IDR_CRPT19 219
#define IDR_CRPT20 220
#define IDR_CRPT21 221
#define IDR_CRPT22 222
#define IDR_CRPT23 223
#define IDR_CRPT24 224
#define IDR_CRPT25 225
#define IDR_CRPT26 226
#define IDR_CRPT27 227
#define IDR_CRPT28 228
#define IDR_CRPT29 229
#define IDR_CRPT30 230
#define IDR_CRPT31 231
#define IDR_CRPT32 232
#define IDR_CRPT33 233
#define IDR_CRPT34 234
#define IDR_CRPT35 235
#define IDR_CRPT36 236
#define IDR_CRPT37 237
#define IDR_CRPT38 238
#define IDR_CRPT39 239
#define IDR_REGISTRY1 242
#define IDS_DOCX_XML_01 301
#define IDS_DOCX_XML_02 302
#define IDS_DOCX_XML_03 303
@ -95,91 +54,51 @@
#define IDS_DOCX_XML_07 307
#define IDS_DOCX_XML_08 308
#define IDS_DOCX_XML_09 309
/*
#define IDS_CONV_XSL_01 401
#define IDS_CONV_XSL_02 402
#define IDS_CONV_XSL_03 403
#define IDS_CONV_XSL_04 404
#define IDS_CONV_XSL_05 405
#define IDS_CONV_XSL_06 406
#define IDS_CONV_XSL_07 407
#define IDS_CONV_XSL_08 408
#define IDS_CONV_XSL_09 409
#define IDS_CONV_XSL_10 410
#define IDS_CONV_XSL_11 411
#define IDS_CONV_XSL_12 412
#define IDS_CONV_XSL_13 413
#define IDS_CONV_XSL_14 414
#define IDS_CONV_XSL_15 415
#define IDS_CONV_XSL_16 416
#define IDS_CONV_XSL_17 417
#define IDS_CONV_XSL_18 418
#define IDS_CONV_XSL_19 419
#define IDS_CONV_XSL_20 420
#define IDS_CONV_XSL_21 421
#define IDS_CONV_XSL_22 422
#define IDS_CONV_XSL_23 423
#define IDS_CONV_XSL_24 424
#define IDS_CONV_XSL_25 425
#define IDS_CONV_XSL_26 426
#define IDS_CONV_XSL_27 427
#define IDS_CONV_XSL_28 428
#define IDS_CONV_XSL_29 429
#define IDS_CONV_XSL_30 430
#define IDS_CONV_XSL_31 431
#define IDS_CONV_XSL_32 432
#define IDS_CONV_XSL_33 433
#define IDS_CONV_XSL_34 434
#define IDS_CONV_XSL_35 435
#define IDS_CONV_XSL_36 436
#define IDS_CONV_XSL_37 437
#define IDS_CONV_XSL_38 438
#define IDS_CONV_XSL_39 439
*/
#define IDS_CONV_CRPT_01 401
#define IDS_CONV_CRPT_02 402
#define IDS_CONV_CRPT_03 403
#define IDS_CONV_CRPT_04 404
#define IDS_CONV_CRPT_05 405
#define IDS_CONV_CRPT_06 406
#define IDS_CONV_CRPT_07 407
#define IDS_CONV_CRPT_08 408
#define IDS_CONV_CRPT_09 409
#define IDS_CONV_CRPT_10 410
#define IDS_CONV_CRPT_11 411
#define IDS_CONV_CRPT_12 412
#define IDS_CONV_CRPT_13 413
#define IDS_CONV_CRPT_14 414
#define IDS_CONV_CRPT_15 415
#define IDS_CONV_CRPT_16 416
#define IDS_CONV_CRPT_17 417
#define IDS_CONV_CRPT_18 418
#define IDS_CONV_CRPT_19 419
#define IDS_CONV_CRPT_20 420
#define IDS_CONV_CRPT_21 421
#define IDS_CONV_CRPT_22 422
#define IDS_CONV_CRPT_23 423
#define IDS_CONV_CRPT_24 424
#define IDS_CONV_CRPT_25 425
#define IDS_CONV_CRPT_26 426
#define IDS_CONV_CRPT_27 427
#define IDS_CONV_CRPT_28 428
#define IDS_CONV_CRPT_29 429
#define IDS_CONV_CRPT_30 430
#define IDS_CONV_CRPT_31 431
#define IDS_CONV_CRPT_32 432
#define IDS_CONV_CRPT_33 433
#define IDS_CONV_CRPT_34 434
#define IDS_CONV_CRPT_35 435
#define IDS_CONV_CRPT_36 436
#define IDS_CONV_CRPT_37 437
#define IDS_CONV_CRPT_38 438
#define IDS_CONV_CRPT_39 439
#define IDS_CONV_CRPT_01 401
#define IDS_CONV_CRPT_02 402
#define IDS_CONV_CRPT_03 403
#define IDS_CONV_CRPT_04 404
#define IDS_CONV_CRPT_05 405
#define IDS_CONV_CRPT_06 406
#define IDS_CONV_CRPT_07 407
#define IDS_CONV_CRPT_08 408
#define IDS_CONV_CRPT_09 409
#define IDS_CONV_CRPT_10 410
#define IDS_CONV_CRPT_11 411
#define IDS_CONV_CRPT_12 412
#define IDS_CONV_CRPT_13 413
#define IDS_CONV_CRPT_14 414
#define IDS_CONV_CRPT_15 415
#define IDS_CONV_CRPT_16 416
#define IDS_CONV_CRPT_17 417
#define IDS_CONV_CRPT_18 418
#define IDS_CONV_CRPT_19 419
#define IDS_CONV_CRPT_20 420
#define IDS_CONV_CRPT_21 421
#define IDS_CONV_CRPT_22 422
#define IDS_CONV_CRPT_23 423
#define IDS_CONV_CRPT_24 424
#define IDS_CONV_CRPT_25 425
#define IDS_CONV_CRPT_26 426
#define IDS_CONV_CRPT_27 427
#define IDS_CONV_CRPT_28 428
#define IDS_CONV_CRPT_29 429
#define IDS_CONV_CRPT_30 430
#define IDS_CONV_CRPT_31 431
#define IDS_CONV_CRPT_32 432
#define IDS_CONV_CRPT_33 433
#define IDS_CONV_CRPT_34 434
#define IDS_CONV_CRPT_35 435
#define IDS_CONV_CRPT_36 436
#define IDS_CONV_CRPT_37 437
#define IDS_CONV_CRPT_38 438
#define IDS_CONV_CRPT_39 439
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 242
#define _APS_NEXT_RESOURCE_VALUE 243
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 201
#define _APS_NEXT_SYMED_VALUE 103

4
ASCOfficeHtmlFile/ASCOfficeHtmlFile/res/XSL/2oox-app.xsl
View File

@ -16,12 +16,12 @@
<Pages>1</Pages>
<Words>10</Words>
<Characters>62</Characters>
<Application>AVS Office Studio</Application>
<Application>ASC Office Studio</Application>
<DocSecurity>0</DocSecurity>
<Lines>1</Lines>
<Paragraphs>1</Paragraphs>
<ScaleCrop>false</ScaleCrop>
<Company>AVS Media</Company>
<Company>ASC Media</Company>
<LinksUpToDate>false</LinksUpToDate>
<CharactersWithSpaces>71</CharactersWithSpaces>
<SharedDoc>false</SharedDoc>

4
ASCOfficeHtmlFile/ASCOfficeHtmlFile/res/XSL/2oox-core.xsl
View File

@ -11,10 +11,10 @@
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dc:title></dc:title>
<dc:subject></dc:subject>
<dc:creator>AVS Office Studio</dc:creator>
<dc:creator>ASC Office Studio</dc:creator>
<cp:keywords></cp:keywords>
<dc:description></dc:description>
<cp:lastModifiedBy>AVS Office Studio</cp:lastModifiedBy>
<cp:lastModifiedBy>ASC Office Studio</cp:lastModifiedBy>
<cp:revision>2</cp:revision>
<dcterms:created xsi:type="dcterms:W3CDTF">2009-07-31T13:10:00Z</dcterms:created>
<dcterms:modified xsi:type="dcterms:W3CDTF">2009-07-31T13:10:00Z</dcterms:modified>

6
ASCOfficeHtmlFile/ASCOfficeHtmlFile/res/version.h
View File

@ -2,6 +2,6 @@
//2
//1
//0
//128
#define INTVER 2,1,0,128
#define STRVER "2,1,0,128\0"
//133
#define INTVER 2,1,0,133
#define STRVER "2,1,0,133\0"

4
ASCOfficeHtmlFile/ASCOfficeHtmlFile/src/CHtmlExport.h
View File

@ -8,11 +8,11 @@
#include "version.h"
#define MHT_FROM "From: <Saved by AVSDocumentConverter>\n"
#define MHT_FROM "From: <Saved by ASCDocumentConverter>\n"
#define MHT_MIME_VERSION "MIME-Version: 1.0\n"
#define MHT_CONTENT_TYPE "Content-Type: multipart/related;\n type=\"text/html\";\n boundary=\"----=_NextPart_000_00\"\n"
#define MHT_BOUNDARY "------=_NextPart_000_00\n"
#define MHT_XMILE_OLE "X-MileOLE: Produced by AVSHTMLFile.dll " STRVER
#define MHT_XMILE_OLE "X-MileOLE: Produced by ASCHTMLFile.dll " STRVER
#define MHT_MESSAGE "\n\nThis is a multi-part message in MIME format.\n\n"
class CHtmlExport

2
ASCOfficeHtmlFile/ASCOfficeHtmlFile/src/HtmlFile.cpp
View File

@ -21,7 +21,7 @@
#include "DateTime.h"
const wchar_t CHtmlFile::m_sLibPath[] = L"AVSOfficeHtmlFile.dll";
const wchar_t CHtmlFile::m_sLibPath[] = L"ASCOfficeHtmlFile.dll";
HRESULT CHtmlFile::FinalConstruct()
{

2
ASCOfficeHtmlFile/ASCOfficeHtmlFile/src/stdafx.h
View File

@ -52,5 +52,5 @@ using namespace ATL;
#import <msxml6.dll>
#import "../../../../../../AVS/Redist/AVSMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT")
#import "../../../Redist/ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT")