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

[bug] Fix bug 69092

Browse Source
This commit is contained in:
Sergey Konovalov
2024-07-10 01:40:58 +03:00
parent 7aa9670d93
commit b149f765f3
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Common/sources/constants.js
View File

@ -128,6 +128,7 @@ exports.AVS_OFFICESTUDIO_FILE_PRESENTATION_POTM = exports.AVS_OFFICESTUDIO_FILE_
exports.AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT = exports.AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x0009;
exports.AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP = exports.AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000a;
exports.AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX_PACKAGE = exports.AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000b;
exports.AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG = exports.AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000c;
exports.AVS_OFFICESTUDIO_FILE_SPREADSHEET = 0x0100;
exports.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX = exports.AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0001;
@ -153,6 +154,7 @@ exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLR = exports.AVS_OFFICESTUDIO_FIL
exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLR_MENU = exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0007;
exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_HTMLR_CANVAS = exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0008;
exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA = exports.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0009;
exports.AVS_OFFICESTUDIO_FILE_IMAGE = 0x0400;
exports.AVS_OFFICESTUDIO_FILE_IMAGE_JPG = exports.AVS_OFFICESTUDIO_FILE_IMAGE + 0x0001;
exports.AVS_OFFICESTUDIO_FILE_IMAGE_TIFF = exports.AVS_OFFICESTUDIO_FILE_IMAGE + 0x0002;
@ -167,6 +169,7 @@ exports.AVS_OFFICESTUDIO_FILE_IMAGE_PCX = exports.AVS_OFFICESTUDIO_FILE_IMAGE +
exports.AVS_OFFICESTUDIO_FILE_IMAGE_RAS = exports.AVS_OFFICESTUDIO_FILE_IMAGE + 0x000b;
exports.AVS_OFFICESTUDIO_FILE_IMAGE_PSD = exports.AVS_OFFICESTUDIO_FILE_IMAGE + 0x000c;
exports.AVS_OFFICESTUDIO_FILE_IMAGE_ICO = exports.AVS_OFFICESTUDIO_FILE_IMAGE + 0x000d;
exports.AVS_OFFICESTUDIO_FILE_OTHER = 0x0800;
exports.AVS_OFFICESTUDIO_FILE_OTHER_EXTRACT_IMAGE = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x0001;
exports.AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x0002;
@ -178,15 +181,27 @@ exports.AVS_OFFICESTUDIO_FILE_OTHER_OOXML = exports.AVS_OFFICESTUDIO_FILE_OTHER
exports.AVS_OFFICESTUDIO_FILE_OTHER_JSON = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x0008; // Для mail-merge
exports.AVS_OFFICESTUDIO_FILE_OTHER_ODF = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x000a;
exports.AVS_OFFICESTUDIO_FILE_OTHER_MS_MITCRYPTO = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x000b;
exports.AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x000c;
exports.AVS_OFFICESTUDIO_FILE_OTHER_PACKAGE_IN_OLE = exports.AVS_OFFICESTUDIO_FILE_OTHER + 0x000d;
exports.AVS_OFFICESTUDIO_FILE_TEAMLAB = 0x1000;
exports.AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY = exports.AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0001;
exports.AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY = exports.AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0002;
exports.AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY = exports.AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0003;
exports.AVS_OFFICESTUDIO_FILE_CANVAS = 0x2000;
exports.AVS_OFFICESTUDIO_FILE_CANVAS_WORD = exports.AVS_OFFICESTUDIO_FILE_CANVAS + 0x0001;
exports.AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET = exports.AVS_OFFICESTUDIO_FILE_CANVAS + 0x0002;
exports.AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION = exports.AVS_OFFICESTUDIO_FILE_CANVAS + 0x0003;
exports.AVS_OFFICESTUDIO_FILE_CANVAS_PDF = exports.AVS_OFFICESTUDIO_FILE_CANVAS + 0x0004;
exports.AVS_OFFICESTUDIO_FILE_DRAW = 0x4000;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSDX = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0001;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSSX = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0002;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSTX = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0003;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSDM = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0004;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSSM = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0005;
exports.AVS_OFFICESTUDIO_FILE_DRAW_VSTM = exports.AVS_OFFICESTUDIO_FILE_DRAW + 0x0006;
exports.NO_ERROR = 0;
exports.UNKNOWN = -1;

31
Common/sources/formatchecker.js
View File

@ -262,6 +262,8 @@ exports.getFormatFromString = function(ext) {
return constants.AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT;
case 'otp':
return constants.AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP;
case 'odg':
return constants.AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG;
case 'xlsx':
return constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX;
@ -278,7 +280,7 @@ exports.getFormatFromString = function(ext) {
return constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTX;
case 'xltm':
return constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTM;
case 'xltb':
case 'xlsb':
return constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSB;
case 'fods':
return constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT;
@ -339,6 +341,18 @@ exports.getFormatFromString = function(ext) {
return constants.AVS_OFFICESTUDIO_FILE_OTHER_OOXML;
case 'odf':
return constants.AVS_OFFICESTUDIO_FILE_OTHER_ODF;
case 'vsdx':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
case 'vssx':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSSX;
case 'vstx':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSTX;
case 'vsdm':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDM;
case 'vssm':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSSM;
case 'vstm':
return constants.AVS_OFFICESTUDIO_FILE_DRAW_VSTM;
default:
return constants.AVS_OFFICESTUDIO_FILE_UNKNOWN;
}
@ -412,6 +426,8 @@ exports.getStringFromFormat = function(format) {
return 'otp';
case constants.AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX_PACKAGE:
return 'xml';
case constants.AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG:
return 'odg';
case constants.AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX:
return 'xlsx';
@ -489,6 +505,7 @@ exports.getStringFromFormat = function(format) {
case constants.AVS_OFFICESTUDIO_FILE_CANVAS_WORD:
case constants.AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET:
case constants.AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION:
case constants.AVS_OFFICESTUDIO_FILE_CANVAS_PDF:
return 'bin';
case constants.AVS_OFFICESTUDIO_FILE_OTHER_OLD_DOCUMENT:
case constants.AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY:
@ -503,6 +520,18 @@ exports.getStringFromFormat = function(format) {
return 'ooxml';
case constants.AVS_OFFICESTUDIO_FILE_OTHER_ODF:
return 'odf';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDX:
return 'vsdx';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSSX:
return 'vssx';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSTX:
return 'vstx';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDM:
return 'vsdm';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSSM:
return 'vssm';
case constants.AVS_OFFICESTUDIO_FILE_DRAW_VSTM:
return 'vstm';
default:
return '';
}