Bug 24925 - У скопированной автофигуры, залитой изображением, вместо превью...

Bug 24925 - У скопированной автофигуры, залитой изображением, вместо превью отображается "красный крест" в правом тулбаре

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

Common/Charts/DrawingObjects.js

@@ -514,7 +514,6 @@ asc_CChart.prototype = {
             }
             else if(_t.range.catHeadersBBox && _t.range.catHeadersBBox.c1 === data_bbox.c1 && _t.range.catHeadersBBox.c2 === data_bbox.c2 && _t.range.catHeadersBBox.r1 === _t.range.catHeadersBBox.r2)
             {
-
                 top_header_bbox = {r1: _t.range.catHeadersBBox.r1, c1: _t.range.catHeadersBBox.c1, r2: _t.range.catHeadersBBox.r1, c2: _t.range.catHeadersBBox.c2};
             }
 

Common/Drawings/CommonController.js

@@ -2796,7 +2796,7 @@ DrawingObjectsController.prototype =
                                 {
                                     if(cur_group.group.spTree[j] === cur_group)
                                     {
-                                        cur_group.group.addToSpTreeToPos(j, sp);
+                                        cur_group.group.addToSpTree(j, sp);
                                         cur_group.group.removeFromSpTree(cur_group.Get_Id());
                                     }
                                 }
@@ -2832,6 +2832,7 @@ DrawingObjectsController.prototype =
                             return;
                         }
                     }
+                    this.resetInternalSelection();
                 }
             }
             //else if(this.selection.chartSelection) TODO
@@ -3754,6 +3755,7 @@ DrawingObjectsController.prototype =
         xfrm.setChOffY(0);
         for(var i = 0; i < arrDrawings.length; ++i)
         {
+            CheckSpPrXfrm(arrDrawings[i]);
             arrDrawings[i].spPr.xfrm.setOffX(arrDrawings[i].x - min_x);
             arrDrawings[i].spPr.xfrm.setOffY(arrDrawings[i].y - min_y);
             arrDrawings[i].setGroup(group);
@@ -4206,6 +4208,7 @@ DrawingObjectsController.prototype =
             {
                 if(asc && asc["editor"])
                     this.drawingObjects.drawingDocument.InitGuiCanvasShape(asc["editor"].shapeElementId);
+                this.drawingObjects.drawingDocument.LastDrawingUrl = null;
                 this.drawingObjects.drawingDocument.DrawImageTextureFillShape(pr.fill.fill.RasterImageId);
             }
             else

Common/Drawings/Format/GroupShape.js

@@ -146,8 +146,7 @@ CGroupShape.prototype =
         if(!isRealNumber(pos))
             pos = this.spTree.length;
         History.Add(this, {Type: historyitem_GroupShapeAddToSpTree, pos: pos, item: item});
-        if(this.recalcBounds)
-            this.recalcBounds();
+        this.handleUpdateSpTree();
         this.spTree.splice(pos, 0, item);
     },
 
@@ -169,8 +168,7 @@ CGroupShape.prototype =
         {
             if(this.spTree[i].Get_Id() === id)
             {
-                if(this.recalcBounds)
-                    this.recalcBounds();
+                this.handleUpdateSpTree();
                 History.Add(this,{Type:historyitem_GroupShapeRemoveFromSpTree, pos: i, item:this.spTree[i]});
                 return this.spTree.splice(i, 1)[0];
             }
@@ -182,6 +180,7 @@ CGroupShape.prototype =
     removeFromSpTreeByPos: function(pos)
     {
         History.Add(this,{Type:historyitem_GroupShapeRemoveFromSpTree, pos: pos, item:this.spTree[pos]});
+        this.handleUpdateSpTree();
         return this.spTree.splice(pos, 1)[0];
     },
 

Common/Shapes/SerializeWriter.js

@@ -1754,7 +1754,8 @@ function CBinaryFileWriter()
 
         oThis.WriteUChar(g_nodeAttributeEnd);
 
-        oThis.WriteRecord1(1, rPr.Unifill, oThis.WriteUniFill);
+        if(rPr.Unifill)
+            oThis.WriteRecord1(1, rPr.Unifill, oThis.WriteUniFill);
 
         if (rPr.RFonts)
         {

Excel/model/clipboard.js

@@ -3328,14 +3328,21 @@
 						{
 							aImagesSync.push(tempArr[n]);
 						}
-					};
-				};
-				
-				window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null, ws.objectRender.asyncImagesDocumentEndLoaded);
-				
-				ws.objectRender.showDrawingObjects(true);
+					}
+				}
+
+                ws.objectRender.showDrawingObjects(true);
                 ws.setSelectionShape(true);
-				History.EndTransaction();
+                History.EndTransaction();
+                if(aImagesSync.length > 0)
+                {
+                    window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null,
+                        function(){
+                            ws.objectRender.showDrawingObjects(true);
+                            ws.objectRender.controller.getGraphicObjectProps();
+                        });
+                }
+
 			},
 			
 			_insertImagesFromBinaryWord: function(ws, data)

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -2075,7 +2075,7 @@ CGraphicObjects.prototype =
                                 {
                                     if(cur_group.group.spTree[j] === cur_group)
                                     {
-                                        cur_group.group.addToSpTreeToPos(j, sp);
+                                        cur_group.group.addToSpTree(j, sp);
                                         cur_group.group.removeFromSpTree(cur_group.Get_Id());
                                     }
                                 }