pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '[SSE] Fix bug 77780' (#810) from fix/bug-77780 into hotfix/v9.2.0

Browse Source
This commit is contained in:
Maxim Kadushkin
2025-10-28 21:59:38 +00:00
parent 8e653594bd 1a332172d9
commit 67c9ed8ffa
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/spreadsheeteditor/main/app/controller/Print.js
View File

@ -328,9 +328,15 @@ define([
var opt = this._changedProps[sheet] ? this._changedProps[sheet].asc_getPageSetup() : new Asc.asc_CPageSetup();
opt.asc_setOrientation(panel.cmbPaperOrientation.getValue() == '-' ? undefined : panel.cmbPaperOrientation.getValue());
var size = panel.cmbPaperSize.getSelectedRecord().size;
var pagew = size[0];
var pageh = size[1];
var pagew, pageh;
const cmbPaperSizeRecord = panel.cmbPaperSize.getSelectedRecord();
if(cmbPaperSizeRecord) {
pagew = cmbPaperSizeRecord.size[0];
pageh = cmbPaperSizeRecord.size[1];
} else {
pagew = panel.getOriginalPageSize().w;
pageh = panel.getOriginalPageSize().h;
}
opt.asc_setWidth(pagew ? pagew : (this._originalPageSettings ? this._originalPageSettings.asc_getWidth() : undefined));
opt.asc_setHeight(pageh? pageh : (this._originalPageSettings ? this._originalPageSettings.asc_getHeight() : undefined));

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View File

@ -3666,6 +3666,10 @@ define([], function () {
this.txtNumberPage.setValue(index + 1);
},
getOriginalPageSize: function () {
return this._originalPageSize;
},
setOriginalPageSize: function (w, h) {
this._originalPageSize = {w: w, h: h};
},