Commit 80658094 authored by Julia Radzhabova's avatar Julia Radzhabova

[DE] Правка к багу 32174.

parent 14a13d62
...@@ -116,7 +116,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -116,7 +116,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
this.tableStylerRows = this.options.tableStylerRows; this.tableStylerRows = this.options.tableStylerRows;
this.tableStylerColumns = this.options.tableStylerColumns; this.tableStylerColumns = this.options.tableStylerColumns;
this.borderProps = this.options.borderProps; this.borderProps = this.options.borderProps;
this.pageWidth = (this.options.sectionProps) ? this.options.sectionProps.get_W() - this.options.sectionProps.get_LeftMargin() - this.options.sectionProps.get_RightMargin() : 210; this.pageWidth = 210;
this._originalProps = new Asc.CTableProp(this.options.tableProps); this._originalProps = new Asc.CTableProp(this.options.tableProps);
}, },
...@@ -1162,6 +1162,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -1162,6 +1162,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
_setDefaults: function(props) { _setDefaults: function(props) {
if (props ){ if (props ){
this._allTable = !props.get_CellSelect(); this._allTable = !props.get_CellSelect();
this.pageWidth = Common.Utils.Metric.fnRecalcFromMM(props.get_PercentFullWidth());
var value, var value,
TableWidth = props.get_Width(), TableWidth = props.get_Width(),
...@@ -2073,7 +2074,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat ...@@ -2073,7 +2074,6 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1); spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
} }
} }
this.pageWidth = Common.Utils.Metric.fnRecalcFromMM(this.pageWidth);
}, },
updateThemeColors: function() { updateThemeColors: function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment