[DE] [PE] Выставление единиц измерения в сдк.

apps/documenteditor/main/app/controller/Main.js

@@ -1048,7 +1048,9 @@ define([
                     }
 
                     var value = Common.localStorage.getItem('de-settings-unit');
-                    Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm);
+                    value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
+                    Common.Utils.Metric.setCurrentMetric(value);
+                    me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
 
                     value = Common.localStorage.getItem('de-hidden-rulers');
                     me.api.asc_SetViewRulers(value===null || parseInt(value) === 0);
@@ -1585,7 +1587,9 @@ define([
 
             unitsChanged: function(m) {
                 var value = Common.localStorage.getItem("de-settings-unit");
-                Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm);
+                value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
+                Common.Utils.Metric.setCurrentMetric(value);
+                this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
                 this.getApplication().getController('RightMenu').updateMetricUnit();
             },
 

apps/presentationeditor/main/app/controller/Main.js

@@ -816,7 +816,9 @@ define([
                     }
 
                     var value = Common.localStorage.getItem('pe-settings-unit');
-                    Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm);
+                    value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
+                    Common.Utils.Metric.setCurrentMetric(value);
+                    me.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
 
                     value = Common.localStorage.getItem('pe-hidden-rulers');
                     if (me.api.asc_SetViewRulers) me.api.asc_SetViewRulers(value===null || parseInt(value) === 0);
@@ -1256,7 +1258,9 @@ define([
 
             unitsChanged: function(m) {
                 var value = Common.localStorage.getItem("pe-settings-unit");
-                Common.Utils.Metric.setCurrentMetric((value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm);
+                value = (value!==null) ? parseInt(value) : Common.Utils.Metric.c_MetricUnits.cm;
+                Common.Utils.Metric.setCurrentMetric(value);
+                this.api.asc_SetDocumentUnits((value==Common.Utils.Metric.c_MetricUnits.inch) ? c_oAscDocumentUnits.Inch : ((value==Common.Utils.Metric.c_MetricUnits.pt) ? c_oAscDocumentUnits.Pt : c_oAscDocumentUnits.Millimeter));
                 this.getApplication().getController('RightMenu').updateMetricUnit();
             },