Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix Bug 43144

Browse source
This commit is contained in:
Julia Svinareva 2019-10-11 10:45:56 +03:00
parent 2c83af7e9e
commit 22675ac1c8
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -141,10 +141,10 @@ define([
panel.cmbPaperSize.setValue(this.txtCustom + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' + panel.cmbPaperSize.setValue(this.txtCustom + ' (' + parseFloat(Common.Utils.Metric.fnRecalcFromMM(w).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ' x ' +
parseFloat(Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')'); parseFloat(Common.Utils.Metric.fnRecalcFromMM(h).toFixed(2)) + Common.Utils.Metric.getCurrentMetricName() + ')');
var fitwidth = opt.asc_getFitToWidth(), this.fitWidth = opt.asc_getFitToWidth();
fitheight = opt.asc_getFitToHeight(), this.fitHeight = opt.asc_getFitToHeight();
fitscale = opt.asc_getScale(); this.fitScale = opt.asc_getScale();
this.setScaling(panel, fitwidth, fitheight, fitscale); this.setScaling(panel, this.fitWidth, this.fitHeight, this.fitScale);
item = panel.cmbPaperOrientation.store.findWhere({value: opt.asc_getOrientation()}); item = panel.cmbPaperOrientation.store.findWhere({value: opt.asc_getOrientation()});
if (item) panel.cmbPaperOrientation.setValue(item.get('value')); if (item) panel.cmbPaperOrientation.setValue(item.get('value'));

6
apps/spreadsheeteditor/main/app/view/ScaleDialog.js
View file

@ -228,8 +228,8 @@ define([
this._state.width = (width !== null && width !== 0) ? width : null; this._state.width = (width !== null && width !== 0) ? width : null;
this._state.height = (height !== null && height !== 0) ? height : null; this._state.height = (height !== null && height !== 0) ? height : null;
width = (width !== null) ? width : 0; width = (width !== null && width !== undefined) ? width : 0;
height = (height !== null) ? height : 0; height = (height !== null && height !== undefined) ? height : 0;
if (width === 0 && height === 0) { if (width === 0 && height === 0) {
this.radioScaleTo.setValue(true,true); this.radioScaleTo.setValue(true,true);
@ -248,7 +248,7 @@ define([
this.cmbScaleHeight.setRawValue(height.toString() + ' ' + this.getTextPages(height)); this.cmbScaleHeight.setRawValue(height.toString() + ' ' + this.getTextPages(height));
} }
this.spnScale.setValue((scale !== null) ? scale : '', true); this.spnScale.setValue((scale !== null && scale !== undefined) ? scale : '', true);
} }
}, },