выставление crossBetween

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57270 954022d7-b5bf-4e40-9824-e11837661b57

Common/Drawings/CommonController.js

@@ -4084,7 +4084,7 @@ DrawingObjectsController.prototype =
             locked = undefined;
             if(!drawing.group)
             {
-                locked = drawing.lockType !== c_oAscLockTypes.kLockTypeNone;
+                locked = drawing.lockType !== c_oAscLockTypes.kLockTypeNone && drawing.lockType !== c_oAscLockTypes.kLockTypeMine ;
             }
             switch(drawing.getObjectType())
             {

Common/Drawings/Format/ChartSpace.js

@@ -3504,7 +3504,7 @@ CChartSpace.prototype =
                     var cat_ax_orientation = cat_ax.scaling && isRealNumber(cat_ax.scaling.orientation) ?  cat_ax.scaling.orientation : ORIENTATION_MIN_MAX;
                     var point_width = rect.w/string_pts.length;
                     var labels_pos = val_ax.tickLblPos;
-                    var cross_between = isRealNumber(val_ax.crossBetween) ? val_ax.crossBetween : CROSS_BETWEEN_MID_CAT;
+                    var cross_between = isRealNumber(val_ax.crossBetween) ? val_ax.crossBetween : CROSS_BETWEEN_BETWEEN;
 
                     var left_val_ax_labels_align = true;//приленгание подписей оси значений к левому краю.
 
@@ -4506,7 +4506,7 @@ CChartSpace.prototype =
 
                     var cat_ax_orientation = cat_ax.scaling && isRealNumber(cat_ax.scaling.orientation) ?  cat_ax.scaling.orientation : ORIENTATION_MIN_MAX;
                     var labels_pos = val_ax.tickLblPos;
-                    var cross_between = isRealNumber(val_ax.crossBetween) ? val_ax.crossBetween : CROSS_BETWEEN_MID_CAT;
+                    var cross_between = isRealNumber(val_ax.crossBetween) ? val_ax.crossBetween : CROSS_BETWEEN_BETWEEN;
 
                     var bottom_val_ax_labels_align = true;//приленгание подписей оси значений к левому краю.
 

Common/SerializeChart.js

@@ -10432,6 +10432,10 @@ BinaryChartReader.prototype.ReadCT_PlotArea = function (type, length, val, oIdTo
         if (null != oNewVal.axId)
             oIdToAxisMap[oNewVal.axId] = oNewVal;
         val.addAxis(oNewVal);
+        if(!isRealNumber(oNewVal.crossBetween))
+        {
+            oNewVal.setCrossBetween(CROSS_BETWEEN_BETWEEN);
+        }
     }
     else if (c_oserct_plotareaDTABLE === type) {
         var oNewVal = new CDTable();