git-svn-id:...

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

Common/Charts/DrawingObjects.js

@@ -676,10 +676,13 @@ asc_CChart.prototype = {
 		}
 	},
 	
-	Read_FromBinary2: function(Reader) {
+	Read_FromBinary2: function(Reader, noReadId) {
 		
 		Reader.GetLong();
-		this.Id = Reader.GetString2();
+
+        var Id = Reader.GetString2();
+        if(!(noReadId === false))
+		    this.Id = Id;
 		
 		this.type = Reader.GetString2();
 		this.subType = Reader.GetString2();

Excel/model/DrawingObjects/Format/Chart.js

@@ -420,6 +420,8 @@ CChartAsGroup.prototype =
 				return;
 		
 			History.Create_NewPoint();
+            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+
 
 			// type, subType, styleId
 			if ( this.chart.type != chart.type ) {
@@ -536,6 +538,8 @@ CChartAsGroup.prototype =
 				this.chart.legend.bOverlay = chart.legend.bOverlay;
 			}
 			this.chart.rebuildSeries();
+            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+
         }
 		else
 			this.chart = chart;
@@ -1648,7 +1652,7 @@ CChartAsGroup.prototype =
             this.hAxisTitle = new CChartTitle(this, CHART_TITLE_TYPE_H_AXIS);
             this.hAxisTitle.readFromBinary(r);
         }
-        this.chart.Read_FromBinary2(r);
+        this.chart.Read_FromBinary2(r, false);
         this.spPr.Read_FromBinary2(r);
         if(isRealNumber(x) && isRealNumber(y))
             this.spPr.xfrm.setPosition(x, y);