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

Excel/model/DrawingObjects/Format/Chart.js

@@ -8,7 +8,7 @@ function CChartAsGroup(drawingBase, drawingObjects)
     this.vAxisTitle = null;
     this.hAxisTitle = null;
 
-    this.chart = new asc_CChart();
+    //this.chart = new asc_CChart();
 
     this.brush = new CBlipFill();
     this.spPr = new CSpPr();
@@ -39,6 +39,11 @@ function CChartAsGroup(drawingBase, drawingObjects)
 
     this.Id = g_oIdCounter.Get_NewId();
     g_oTableId.Add(this, this.Id);
+    if(isRealObject(drawingObjects))
+    {
+        this.setDrawingObjects(drawingObjects);
+        this.setAscChart(new asc_CChart());
+    }
 }
 
 
@@ -49,6 +54,13 @@ CChartAsGroup.prototype =
         return CLASS_TYPE_CHART_AS_GROUP;
     },
 
+    setAscChart: function(chart)
+    {
+        var old_id = isRealObject(this.chart) ? this.chart.Get_Id() : null;
+        var new_id = isRealObject(chart) ? chart.Get_Id() : null;
+        History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_Set_AscChart, null, null, new UndoRedoDataGraphicObjects(this.Id, new UndoRedoDataGOSingleProp(old_id, new_id)), null);
+    },
+
     Get_Id: function()
     {
         return this.Id;
@@ -831,6 +843,8 @@ CChartAsGroup.prototype =
         return [];
     },
 
+
+
     select: function(drawingObjectsController)
     {
         this.selected = true;
@@ -1506,6 +1520,11 @@ CChartAsGroup.prototype =
                 this.drawingObjects.addGraphicObject(this, data.oldValue);
                 break;
             }
+            case historyitem_AutoShapes_Set_AscChart:
+            {
+                this.chart = g_oTableId.Get_ById(data.oldValue);
+                break;
+            }
         }
     },
 
@@ -1528,6 +1547,12 @@ CChartAsGroup.prototype =
                 this.drawingObjects.deleteDrawingBase(this.Id);
                 break;
             }
+
+            case historyitem_AutoShapes_Set_AscChart:
+            {
+                this.chart = g_oTableId.Get_ById(data.newValue);
+                break;
+            }
         }
     },
 

Excel/model/DrawingObjects/Format/ChartTitle.js

@@ -22,16 +22,6 @@ function CChartTitle(chartGroup, type)
     this.extX = null;
     this.extY = null;
 
-  /*  this.pen = new CLn();
-    this.pen.w = 90000;
-    this.pen.Fill = new CUniFill();
-    this.pen.Fill.fill = new CSolidFill();
-    this.pen.Fill.fill.color.color = new CRGBColor();
-
-    this.brush = new CUniFill();
-    this.brush.fill = new CSolidFill();
-    this.brush.fill.color.color = new CRGBColor();  */
-
     this.brush = null;
     this.pen = null;
     this.spPr.geometry = CreateGeometry("rect");

Excel/model/DrawingObjects/Format/Image.js

@@ -379,16 +379,26 @@ CImageShape.prototype =
 
     recalculateBrush: function(aImagesSync)
     {
-        this.brush = new CUniFill();
+        var b_is_on  = History.Is_On();
+        if(b_is_on)
+        {
+            History.TurnOff();
+        }
+        this.brush = this.blipFill.createDuplicate();
+        /*this.brush = new CUniFill();
         this.brush.fill = new CBlipFill();
-        this.brush.fill.RasterImageId = getFullImageSrc(this.blipFill.fill.RasterImageId);
+        this.brush.fill.RasterImageId = getFullImageSrc(this.blipFill.fill.RasterImageId);      */
+        if(b_is_on)
+        {
+            History.TurnOn();
+        }
         if(Array.isArray(aImagesSync))
         {
             aImagesSync.push(getFullImageSrc(this.brush.fill.RasterImageId));
         }
         if(this.drawingObjects)
         {
-            this.drawingObjects.loadImageRedraw(this.brush.fill.RasterImageId);
+            this.drawingObjects.loadImageRedraw(getFullImageSrc(this.brush.fill.RasterImageId));
         }
 
     },

Excel/model/History.js

@@ -179,6 +179,8 @@ var historyitem_AutoShapes_LeftInset = 68;
 var historyitem_AutoShapes_BottomInset = 68;
 var historyitem_AutoShapes_Set_AutoShapeStyle = 69;
 var historyitem_AutoShapes_Set_ImageBlipFill = 70;
+var historyitem_AutoShapes_Set_AscChart  = 71;
+