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

Common/Charts/DrawingObjects.js

@@ -2948,6 +2948,7 @@ function DrawingObjects() {
                 }
                 drawingObject.graphicObject.setDrawingDocument(this.drawingDocument);
                 var old_len = aImagesSync.length;
+                drawingObject.graphicObject.initCharts();
                 drawingObject.graphicObject.recalculate(aImagesSync);
                 if(aImagesSync.length > old_len)
                     aObjectsSync[aObjectsSync.length] = drawingObject;

Excel/model/DrawingObjects/Format/Chart.js

 
 function CChartAsGroup(drawingBase, drawingObjects)
 {
-    this.drawingBase = drawingBase;
+    this.drawingBase = drawingBase && drawingBase.updateAnchorPosition ?  drawingBase : null;
     this.drawingObjects = drawingObjects;
 
     this.chartTitle = null;

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -97,6 +97,13 @@ CGroupShape.prototype =
 			var oldValue = isRealObject(this.drawingObjects) ? this.drawingObjects.getWorksheet().model.getId() : null;
 			History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetDrawingObjects, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldValue, newValue)));
 			this.drawingObjects = drawingObjects;
+            for(var i = 0; i < this.spTree.length; ++i)
+            {
+                if(typeof this.spTree[i].setDrawingObjects === "function")
+                {
+                    this.spTree[i].setDrawingObjects(drawingObjects);
+                }
+            }
 		}
     },
 
@@ -457,6 +464,19 @@ CGroupShape.prototype =
 		}
     },
 
+    initCharts: function()
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(this.spTree[i] instanceof CChartAsGroup)
+            {
+                this.spTree[i].init();
+            }
+            if(this.spTree[i] instanceof CGroupShape)
+                this.spTree[i].initCharts();
+        }
+    },
+
     recalculate: function(aImages)
     {
         //if(this.recalcInfo.recalculateTransform)