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 remote-tracking branch 'origin/hotfix/v7.5.1' into develop

Browse Source
This commit is contained in:
Elena.Subbotina
2023-10-30 17:28:18 +03:00
parent c8f4a6410f 28336a9584
commit fea638a44f
35 changed files with 1023 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/OfficeFileFormats.h
View File

@ -119,7 +119,7 @@
#define AVS_OFFICESTUDIO_FILE_OTHER_OLD_DOCUMENT AVS_OFFICESTUDIO_FILE_OTHER + 0x0004
#define AVS_OFFICESTUDIO_FILE_OTHER_OLD_PRESENTATION AVS_OFFICESTUDIO_FILE_OTHER + 0x0005
#define AVS_OFFICESTUDIO_FILE_OTHER_OLD_DRAWING AVS_OFFICESTUDIO_FILE_OTHER + 0x0006
#define AVS_OFFICESTUDIO_FILE_OTHER_TEAMLAB_INNER AVS_OFFICESTUDIO_FILE_OTHER + 0x0007
#define AVS_OFFICESTUDIO_FILE_OTHER_OOXML AVS_OFFICESTUDIO_FILE_OTHER + 0x0007
#define AVS_OFFICESTUDIO_FILE_OTHER_JSON AVS_OFFICESTUDIO_FILE_OTHER + 0x0008 // Для mail-merge
#define AVS_OFFICESTUDIO_FILE_OTHER_ZIP AVS_OFFICESTUDIO_FILE_OTHER + 0x0009
#define AVS_OFFICESTUDIO_FILE_OTHER_ODF AVS_OFFICESTUDIO_FILE_OTHER + 0x000a