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

Merge branch 'release/v7.5.0' into develop

Browse Source
This commit is contained in:
Oleg Korshul
2023-08-31 21:16:00 +03:00
parent 0142a86c6d 5354f99677
commit 26f2fbb582
72 changed files with 2230 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
DesktopEditor/doctrenderer/docbuilder_p.h
View File

@ -102,6 +102,12 @@ namespace NSDoctRenderer
nFormat = AVS_OFFICESTUDIO_FILE_IMAGE_PNG;
else if (L"vsdx" == sExt)
nFormat = AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
else if (L"docxf" == sExt)
nFormat = AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCXF;
else if (L"oform" == sExt)
nFormat = AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM;
else if (L"html" == sExt)
nFormat = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER;
return nFormat;
}
}
@ -1263,42 +1269,7 @@ namespace NSDoctRenderer
int SaveFile(const std::wstring& ext, const std::wstring& path, const wchar_t* params = NULL)
{
int nType = -1;
if (L"docx" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX;
else if (L"doc" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC;
else if (L"odt" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT;
else if (L"rtf" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF;
else if (L"txt" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT;
else if (L"pptx" == ext)
nType = AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX;
else if (L"odp" == ext)
nType = AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP;
else if (L"xlsx" == ext)
nType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX;
else if (L"xls" == ext)
nType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS;
else if (L"ods" == ext)
nType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS;
else if (L"csv" == ext)
nType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV;
else if (L"pdf" == ext)
nType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF;
else if (L"image" == ext)
nType = AVS_OFFICESTUDIO_FILE_IMAGE;
else if (L"jpg" == ext)
nType = AVS_OFFICESTUDIO_FILE_IMAGE;
else if (L"png" == ext)
nType = AVS_OFFICESTUDIO_FILE_IMAGE;
else if (L"html" == ext)
nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER;
else if (L"vsdx" == ext)
nType = AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
int nType = GetFormatByTexExtention(ext);
return SaveFile(nType, path, params);
}