Bug 25223 - Диаграмма не отрисовывается, если диапазон значений находится за...

Bug 25223 - Диаграмма не отрисовывается, если диапазон значений находится за пределами области видимости

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

Common/Drawings/CommonController.js

@@ -4485,6 +4485,27 @@ DrawingObjectsController.prototype =
         };
         this.drawingObjects.objectLocker.checkObjects(callback2);
     },
+    checkObjectsAndCallback: function(callback, args)
+    {
+        this.drawingObjects.objectLocker.reset();
+        var objects = this.getDrawingObjects();
+        for(var i = 0; i < objects.length; ++i)
+        {
+            this.drawingObjects.objectLocker.addObjectId(objects[i].Get_Id());
+        }
+        var _this = this;
+        var callback2 = function(bLock)
+        {
+            if(bLock)
+            {
+                callback.apply(_this, args);
+                _this.startRecalculate();
+                _this.recalculateCurPos();
+                _this.drawingObjects.sendGraphicObjectProps();
+            }
+        };
+        this.drawingObjects.objectLocker.checkObjects(callback2);
+    },
 
     setGraphicObjectPropsCallBack: function(props)
     {

Common/Drawings/Format/Format.js

@@ -8101,6 +8101,9 @@ CXfrm.prototype =
                 break;
             }
         }
+
+        if(type ===  historyitem_Xfrm_SetOffX || type === historyitem_Xfrm_SetOffY)
+            return this;
     }
 };
 

Excel/model/DrawingObjects/Format/ChartSpacePrototype.js

@@ -70,6 +70,7 @@ CChartSpace.prototype.setRecalculateInfo = function()
     this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
     this.chartObj = null;
     this.rectGeometry = ExecuteNoHistory(function(){return  CreateGeometry("rect");},  this, []);
+    this.lockType = c_oAscLockTypes.kLockTypeNone;
 };
 CChartSpace.prototype.recalcTransform = function()
 {

Excel/model/DrawingObjects/Format/GroupPrototype.js

@@ -40,6 +40,8 @@ CGroupShape.prototype.setRecalculateInfo = function()
     };
     this.localTransform = new CMatrix();
     this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
+
+    this.lockType = c_oAscLockTypes.kLockTypeNone;
 };
 
 CGroupShape.prototype.recalcTransform = function()

Excel/model/DrawingObjects/Format/ImagePrototype.js

@@ -33,6 +33,7 @@ CImageShape.prototype.setRecalculateInfo = function()
         recalculateTransparent:    true
     };
     this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
+    this.lockType = c_oAscLockTypes.kLockTypeNone;
 };
 
 CImageShape.prototype.recalcBrush = function()

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -145,6 +145,7 @@ CShape.prototype.setRecalculateInfo = function()
     this.compiledStyles = [];
     this.textPropsForRecalc = [];
     this.bounds = {l: 0, t: 0, r: 0, b:0, w: 0, h:0};
+    this.lockType = c_oAscLockTypes.kLockTypeNone;
 };
 CShape.prototype.recalcContent = function()
 {