Поправлено падение при завершении добавления сплайнов и полилиний

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

Excel/model/DrawingObjects/States.js

@@ -2406,8 +2406,6 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects, presetGeom
             this.drawingObjectsController.onMouseUp(e, x, y);*/
         }
 
-        //лочим добавленный шейп
-        var worksheet = this.drawingObjects.getWorksheet();
 				
 		this.drawingObjects.objectLocker.reset();
 		this.drawingObjects.objectLocker.addObjectId(this.resultObject.Get_Id());
@@ -4130,7 +4128,8 @@ function SplineBezierState2(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
-            this.spline.createShape(null, this.drawingObjects);
+            History.Create_NewPoint();
+            var shape = this.spline.createShape(null, this.drawingObjects);
             asc["editor"].asc_endAddShape();
 
             this.drawingObjectsController.clearTrackObjects();
@@ -4138,6 +4137,10 @@ function SplineBezierState2(drawingObjectsController, drawingObjects, startX, st
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
             asc["editor"].asc_endAddShape();
 
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
+
         }
     };
 
@@ -4185,7 +4188,8 @@ function SplineBezierState3(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
-            this.spline.createShape(this.drawingObjects);
+            History.Create_NewPoint();
+            var shape = this.spline.createShape(this.drawingObjects);
             asc["editor"].asc_endAddShape();
 
             this.drawingObjectsController.clearTrackObjects();
@@ -4193,6 +4197,11 @@ function SplineBezierState3(drawingObjectsController, drawingObjects, startX, st
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
             asc["editor"].asc_endAddShape();
 
+
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
+
         }
     };
 
@@ -4274,7 +4283,8 @@ function SplineBezierState4(drawingObjectsController, drawingObjects, spline)
     {
         if(e.ClickCount >= 2)
         {
-            this.spline.createShape(this.drawingObjects);
+            History.Create_NewPoint();
+            var shape = this.spline.createShape(this.drawingObjects);
             asc["editor"].asc_endAddShape();
 
             this.drawingObjectsController.clearTrackObjects();
@@ -4282,6 +4292,10 @@ function SplineBezierState4(drawingObjectsController, drawingObjects, spline)
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
             asc["editor"].asc_endAddShape();
 
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
+
         }
     };
 
@@ -4382,13 +4396,18 @@ function SplineBezierState5(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
-            this.spline.createShape(this.drawingObjects);
+            History.Create_NewPoint();
+            var shape = this.spline.createShape(this.drawingObjects);
             asc["editor"].asc_endAddShape();
             this.drawingObjectsController.clearTrackObjects();
             this.drawingObjects.OnUpdateOverlay();
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
             asc["editor"].asc_endAddShape();
 
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
+
         }
     };
 
@@ -4560,7 +4579,12 @@ function PolyLineAddState2(drawingObjectsController, drawingObjects, minDistance
     {
         if(this.polyline.arrPoint.length > 1)
         {
-            this.polyline.createShape();
+            History.Create_NewPoint();
+            var shape = this.polyline.createShape();
+
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
         }
 
         this.drawingObjectsController.clearTrackObjects();
@@ -4701,7 +4725,11 @@ function AddPolyLine2State3(drawingObjectsController, drawingObjects, polyline)
         this.polyline.arrPoint.push({x: x, y: y});
         if(e.ClickCount > 1)
         {
-            this.polyline.createShape();
+            History.Create_NewPoint();
+            var shape = this.polyline.createShape();
+            this.drawingObjects.objectLocker.reset();
+            this.drawingObjects.objectLocker.addObjectId(shape.Get_Id());
+            this.drawingObjects.objectLocker.checkObjects(function(bLock){});
             this.drawingObjectsController.clearTrackObjects();
             this.drawingObjects.OnUpdateOverlay();
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));

Excel/model/DrawingObjects/Tracks/PolyLine.js

@@ -134,9 +134,10 @@ function PolyLine (drawingObjects)
 
         var shape = new CShape(null, this.drawingObjects);
 
+        shape.setXfrmObject(new CXfrm());
         shape.setPosition(xMin, yMin);
         shape.setExtents(xMax-xMin, yMax-yMin);
-        shape.setStyle(CreateDefaultShapeStyle());
+        shape.setStyleBinary(CreateDefaultShapeStyle());
         var geometry = new CGeometry();
 
         geometry.AddPathCommand(0, undefined, bClosed ? "norm": "none", undefined, xMax - xMin, yMax-yMin);
@@ -151,10 +152,14 @@ function PolyLine (drawingObjects)
             geometry.AddPathCommand(6);
         }
         geometry.Init( xMax-xMin, yMax-yMin);
-        shape.spPr.geometry = geometry;
+        shape.setGeometry(geometry);
         shape.recalculate();
 
-        this.drawingObjects.addGraphicObject(shape);
+        shape.addToDrawingObjects();
+
+        History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateAfterInit, null, null,
+            new UndoRedoDataGraphicObjects(shape.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+        return shape;
     }
 }
 

Excel/model/DrawingObjects/Tracks/Spline.js

@@ -247,10 +247,10 @@ function Spline(drawingObjects)
         yMin = min_y;
         yMax = max_y;
         var shape = new CShape(null, this.drawingObjects);
-
+        shape.setXfrmObject(new CXfrm());
         shape.setPosition(xMin, yMin);
         shape.setExtents(xMax-xMin, yMax-yMin);
-        shape.setStyle(CreateDefaultShapeStyle());
+        shape.setStyleBinary(CreateDefaultShapeStyle());
 
         var geometry = new CGeometry();
         geometry.AddPathCommand(0, undefined, bClosed ? "norm": "none", undefined, xMax - xMin, yMax-yMin);
@@ -281,9 +281,13 @@ function Spline(drawingObjects)
             geometry.AddPathCommand(6);
         }
         geometry.Init( xMax-xMin, yMax-yMin);
-        shape.spPr.geometry = geometry;
+        shape.setGeometry(geometry);
         shape.recalculate();
-        this.drawingObjects.addGraphicObject(shape);
+        shape.addToDrawingObjects();
+
+        History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateAfterInit, null, null,
+            new UndoRedoDataGraphicObjects(shape.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+        return shape;
     };
 
     this.addPathCommand = function(pathCommand)