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

Merge branch hotfix/v9.0.2 into develop

Browse Source
This commit is contained in:
papacarlo
2025-07-07 14:43:16 +00:00
parent 9e101b7e43 d40551ca6f
commit cb6e63a152
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DocService/sources/converterservice.js
View File

@ -279,6 +279,7 @@ function convertRequest(req, res, isJson) {
utils.fillResponse(req, res, new commonDefines.ConvertStatus(constants.CONVERT_PARAMS), isJson);
return;
}
let oformAsPdf;
if (params.pdf) {
if (true === params.pdf.pdfa && constants.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF === outputFormat) {
outputFormat = constants.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA;
@ -288,6 +289,8 @@ function convertRequest(req, res, isJson) {
if (params.pdf.form && (constants.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF === outputFormat ||
constants.AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA === outputFormat)) {
outputFormat = constants.AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF;
} else if (false === params.pdf.form) {
oformAsPdf = true;
}
}
//todo use hash of params as id
@ -299,6 +302,7 @@ function convertRequest(req, res, isJson) {
cmd.setFormat(filetype);
cmd.setDocId(docId);
cmd.setOutputFormat(outputFormat);
cmd.setOformAsPdf(oformAsPdf);
let outputExt = formatChecker.getStringFromFormat(cmd.getOutputFormat());
cmd.setCodepage(commonDefines.c_oAscEncodingsMap[params.codePage] || commonDefines.c_oAscCodePageUtf8);