правка бага 21477 - Падение приложения при передаче автофигуры "произвольная линия"

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

PowerPoint/Editor/GraphicObjects.js

@@ -628,7 +628,7 @@ CGraphicObjects.prototype = {
             {
                 images.push(selected_object);
             }
-            else if(typeof  selected_object.isGroup())
+            else if(typeof  selected_object.isGroup === "function" && selected_object.isGroup())
             {
                 groups.push(selected_object);
             }

PowerPoint/Editor/States.js

@@ -3853,14 +3853,18 @@ function SplineBezierState2(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
+            History.Create_NewPoint();
             var sp = this.spline.createShape(null, this.drawingObjects);
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
 
             this.drawingObjectsController.clearTrackObjects();
@@ -3915,14 +3919,19 @@ function SplineBezierState3(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
+
+            History.Create_NewPoint();
             var sp = this.spline.createShape(this.drawingObjects);
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
 
             this.drawingObjectsController.clearTrackObjects();
@@ -4011,14 +4020,18 @@ function SplineBezierState4(drawingObjectsController, drawingObjects, spline)
     {
         if(e.ClickCount >= 2)
         {
+            History.Create_NewPoint();
             var sp = this.spline.createShape(this.drawingObjects);
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
 
             this.drawingObjectsController.clearTrackObjects();
@@ -4126,14 +4139,18 @@ function SplineBezierState5(drawingObjectsController, drawingObjects, startX, st
     {
         if(e.ClickCount >= 2)
         {
+            History.Create_NewPoint();
             var sp = this.spline.createShape(this.drawingObjects);
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
             this.drawingObjectsController.clearTrackObjects();
             this.drawingObjects.OnUpdateOverlay();
@@ -4311,14 +4328,19 @@ function PolyLineAddState2(drawingObjectsController, drawingObjects, minDistance
     {
         if(this.polyline.arrPoint.length > 1)
         {
+
+            History.Create_NewPoint();
             var sp = this.polyline.createShape();
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
         }
 
@@ -4460,14 +4482,19 @@ function AddPolyLine2State3(drawingObjectsController, drawingObjects, polyline)
         this.polyline.arrPoint.push({x: x, y: y});
         if(e.ClickCount > 1)
         {
+
+            History.Create_NewPoint();
             var sp = this.polyline.createShape();
             var p = editor.WordControl.m_oLogicDocument;
             if(p.Document_Is_SelectionLocked(changestype_AddShape, sp) === false)
             {
-                History.Create_NewPoint();
                 this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, sp);
                 p.Recalculate();
             }
+            else
+            {
+                History.Undo();
+            }
 
             this.drawingObjectsController.clearTrackObjects();
             this.drawingObjects.OnUpdateOverlay();