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

Merge remote-tracking branch 'origin/feature/odg' into release/v8.1.0

Browse Source
This commit is contained in:
Elena Subbotina
2024-04-05 16:47:48 +03:00
parent 6fdac51409 e8a4dab0ea
commit d13e5dc3da
19 changed files with 342 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/OfficeFileFormatChecker2.cpp
View File

@ -1093,6 +1093,7 @@ bool COfficeFileFormatChecker::isOpenOfficeFormatFile(const std::wstring &fileNa
const char *odtFormatLine = "application/vnd.oasis.opendocument.text";
const char *odsFormatLine = "application/vnd.oasis.opendocument.spreadsheet";
const char *odpFormatLine = "application/vnd.oasis.opendocument.presentation";
const char* odgFormatLine = "application/vnd.oasis.opendocument.graphics";
const char *ottFormatLine = "application/vnd.oasis.opendocument.text-template";
const char *otsFormatLine = "application/vnd.oasis.opendocument.spreadsheet-template";
const char *otpFormatLine = "application/vnd.oasis.opendocument.presentation-template";
@ -1143,6 +1144,10 @@ bool COfficeFileFormatChecker::isOpenOfficeFormatFile(const std::wstring &fileNa
{
nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP;
}
else if (NULL != strstr((char*)pBuffer, odgFormatLine))
{
nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG;
}
else if (NULL != strstr((char *)pBuffer, epubFormatLine))
{
nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB;