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

[x2t] For opening DOCX_FLAT via xml

Browse Source
This commit is contained in:
Sergey Konovalov
2020-06-18 12:59:43 +03:00
parent a103fc00b5
commit daf05b4410
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
X2tConverter/src/ASCConverters.cpp
View File

@ -3327,7 +3327,7 @@ namespace NExtractTools
bPaid = *params.m_bPaid; bPaid = *params.m_bPaid;
_UINT32 nRes = 0; _UINT32 nRes = 0;
if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom || AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_FLAT == nFormatFrom)
{ {
if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo) if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo)
{ {
@ -3339,6 +3339,8 @@ namespace NExtractTools
nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params); nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params);
else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom)
nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params); nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params);
else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_FLAT == nFormatFrom)
nRes = docxflat2doct_bin(sFrom, sTo, sTemp, params);
else else
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
} }
@ -3354,6 +3356,8 @@ namespace NExtractTools
nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params); nRes = mht2doct_dir(sFrom, sDoctDir, sTemp, params);
else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatFrom)
nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params); nRes = epub2doct_dir(sFrom, sDoctDir, sTemp, params);
else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_FLAT == nFormatFrom)
nRes = docxflat2doct_bin(sFrom, sTFile, sTemp, params);
else else
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;