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

Common/Charts/DrawingObjects.js

@@ -2178,6 +2178,16 @@ function DrawingObjects() {
 			return _t.graphicObject != null;
 		}
 		
+		_t.isLocked = function(callback) {
+			_this.objectLocker.reset();
+			if ( _t.graphicObject ) {
+				_this.objectLocker.addObjectId(_t.graphicObject.Id);
+				_this.objectLocker.checkObjects(callback);
+			}
+			else
+				callback(true);
+		}
+		
 		_t.getWorkbook = function() {
 			return (_t.worksheet ? _t.worksheet.model.workbook : null);
 		}
@@ -2499,14 +2509,7 @@ function DrawingObjects() {
 				
 				drawingObject.graphicObject.drawingBase = drawingObject;
                 drawingObject.graphicObject.drawingObjects = _this;
-				
-				History.TurnOff();
-				var metrics = drawingObject.getGraphicObjectMetrics();
-				drawingObject.graphicObject.setPosition( metrics.x, metrics.y );
-				drawingObject.graphicObject.setExtents( metrics.extX, metrics.extY );
-				drawingObject.graphicObject.recalculateTransform();
-				drawingObject.graphicObject.calculateTransformTextMatrix();
-				History.TurnOn();
+				drawingObject.graphicObject.recalculate();
 				
 				aObjects.push( drawingObject );
 			}
@@ -3169,7 +3172,12 @@ function DrawingObjects() {
 		var metrics = null;
 
 		for (var i = 0; i < aObjects.length; i++) {
+			
 			var obj = aObjects[i];
+			obj.isLocked(callbackFunc);
+			
+			function callbackFunc(result) {
+				if ( result ) {
 					var bbox = obj.isChart() ? obj.graphicObject.chart.range.intervalObject.getBBox0() : null;
 
 					if ( obj.isChart() || obj.isImage() || obj.isShape() ) {
@@ -3485,6 +3493,8 @@ function DrawingObjects() {
 					}
 				}
 			}
+		}
+	}
 	
 	_this.moveRangeDrawingObject = function(oBBoxFrom, oBBoxTo, bResize) {
 		

Excel/model/DrawingObjects/Format/Shape.js

@@ -880,11 +880,27 @@ CShape.prototype =
     recalculate: function()
     {
         if(this.recalcInfo.recalculateTransform)
+		{
             this.recalculateTransform();
+			this.recalcInfo.recalculateTransform = false;
+		}
         if(this.recalcInfo.recalculateBrush)
+		{
             this.recalculateBrush();
+			this.recalcInfo.recalculateBrush = false;
+		}
 		if(this.recalcInfo.recalculatePen)
+		{
             this.recalculatePen();
+			this.recalcInfo.recalculatePen = false;
+		}
+		if(this.recalInfo.recalculateGeometry)
+		{
+			if(this.spPr.geometry)
+			{
+				this.spPr.geometry.Recalculate(this.extX, this.extY);
+			}
+		}
     },
 
 	calculateFill: function()