правки в Insert_Content.

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

Common/Drawings/CommonController.js

@@ -540,7 +540,7 @@ DrawingObjectsController.prototype =
             {
                 tx = invert_transform_text.TransformPointX(x, y);
                 ty = invert_transform_text.TransformPointY(x, y);
-                if(this.document || this.drawingObjects.cSld)
+                if(this.document || (this.drawingObjects.cSld && !(this.noNeedUpdateCursorType === true)))
                 {
                     content.Update_CursorType(tx, ty, pageIndex);
                     ret.updated = true;

Common/Drawings/States.js

@@ -1185,11 +1185,13 @@ TextAddState.prototype =
         this.drawingObjects.drawingObjects.sendGraphicObjectProps();
         this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
         this.drawingObjects.handleEventMode = HANDLE_EVENT_MODE_CURSOR;
+        this.drawingObjects.noNeedUpdateCursorType = true;
         var cursor_type = this.drawingObjects.onMouseDown(e, x, y, pageIndex);
         if(cursor_type && cursor_type.hyperlink)
         {
             this.drawingObjects.drawingObjects.showDrawingObjects(true);
         }
+        this.drawingObjects.noNeedUpdateCursorType = false;
         this.drawingObjects.handleEventMode = HANDLE_EVENT_MODE_HANDLE;
         if(editor && editor.isPaintFormat)
         {

PowerPoint/Editor/Format/Presentation.js

@@ -2936,6 +2936,17 @@ CPresentation.prototype =
             {
                 for(i = 0; i < Content.Drawings.length; ++i)
                 {
+                    if(Content.Drawings[i].Drawing.bDeleted)
+                    {
+                        if(Content.Drawings[i].Drawing.setBDeleted2)
+                        {
+                            Content.Drawings[i].Drawing.setBDeleted2(false);
+                        }
+                        else if(Content.Drawings[i].Drawing.setBDeleted)
+                        {
+                            Content.Drawings[i].Drawing.setBDeleted(false);
+                        }
+                    }
                     Content.Drawings[i].Drawing.setParent(this.Slides[this.CurPage]);
                     Content.Drawings[i].Drawing.addToDrawingObjects();
                 }