Bug 26613 - Ошибка в консоли после вставки группы автофигур, содержащих текст, из CDE

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

Common/Drawings/Format/GroupShape.js

@@ -83,6 +83,24 @@ CGroupShape.prototype =
         this.bDeleted = pr;
     },
 
+
+    setBDeleted2: function(pr)
+    {
+        this.bDeleted = pr;
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(this.spTree[i].setBDeleted2)
+            {
+                this.spTree[i].setBDeleted2(pr);
+            }
+            else
+            {
+                this.spTree[i].bDeleted = pr;
+            }
+        }
+    },
+
+
     documentUpdateSelectionState: function()
     {
         if(this.selection.textSelection)
@@ -317,6 +335,7 @@ CGroupShape.prototype =
         for(i = 0; i < sp_tree_copy.length; ++i)
         {
             this.addToSpTree(this.spTree.length, sp_tree_copy[i].convertToPPTX(drawingDocument, worksheet));
+            this.spTree[this.spTree.length - 1].setGroup(this);
         }
         return this;
     },

Excel/model/DrawingObjects/Format/ImagePrototype.js

@@ -120,6 +120,8 @@ CImageShape.prototype.getHierarchy = CShape.prototype.getHierarchy;
 CImageShape.prototype.getParentObjects = CShape.prototype.getParentObjects;
 CImageShape.prototype.recalculate = function () 
 {
+    if(this.bDeleted)
+        return;
     ExecuteNoHistory(function(){
     if (this.recalcInfo.recalculateBrush) {
         this.recalculateBrush();

Excel/model/DrawingObjects/Format/ShapePrototype.js

@@ -303,6 +303,8 @@ CShape.prototype.recalcText = function()
 
 CShape.prototype.recalculate = function ()
 {
+    if(this.bDeleted)
+        return;
     ExecuteNoHistory(function(){
 
 

Excel/model/clipboard.js

@@ -3145,8 +3145,15 @@
 					graphicObject = data[i].image.GraphicObj;
 					
 					//convert from word
-                    graphicObject.bDeleted = true;
-					graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model)
+                    if(graphicObject.setBDeleted2)
+                    {
+                        graphicObject.setBDeleted2(true);
+                    }
+                    else
+                    {
+                        graphicObject.bDeleted = true;
+                    }
+					graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model);
 					
 					//create new drawingBase
 					drawingObject = ws.objectRender.createDrawingObject();