Bug 24651 - Убрать возможность удалять диаграмму во фрейме

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

Common/Charts/DrawingObjects.js

@@ -4084,6 +4084,12 @@ function DrawingObjects() {
 
         if ( chart instanceof asc_ChartSettings )
         {
+            if(api.isChartEditor)
+            {
+                this.controller.selectObject(aObjects[0].graphicObject, 0);
+                this.controller.editChartDrawingObjects(chart);
+                return;
+            }
             var asc_chart = new asc_CChart();
             var rangeWs = convertFormula2(chart.range, worksheet);
             asc_chart.range.intervalObject = rangeWs.range;
@@ -4303,6 +4309,10 @@ function DrawingObjects() {
     {
         if ( chart )
         {
+            if(api.isChartEditor)
+            {
+                this.controller.selectObject(aObjects[0].graphicObject, 0);
+            }
             _this.controller.editChartDrawingObjects(chart);
             _this.showDrawingObjects(false);
         }
@@ -5394,7 +5404,15 @@ function DrawingObjects() {
             return chart;
         }   */
 
-        var settings = _this.controller.getChartProps();
+
+
+
+        var settings;
+        if(api.isChartEditor)
+        {
+            return this.controller.getPropsFromChart(aObjects[0].graphicObject);
+        }
+        settings = _this.controller.getChartProps();
         if ( !settings )
         {
             settings = new asc_ChartSettings();

Common/Drawings/CommonController.js

@@ -2684,6 +2684,11 @@ DrawingObjectsController.prototype =
 
     remove: function(dir)
     {
+        var asc = window["Asc"] ? window["Asc"] : (window["Asc"] = {});
+        if(asc["editor"] && asc["editor"].isChartEditor)
+        {
+            return;
+        }
         this.checkSelectedObjectsAndCallback(this.removeCallback, [dir]);
     },
 

Word/Editor/GraphicObjects/Format/ChartSpacePrototype.js

@@ -46,14 +46,15 @@ CChartSpace.prototype.Get_ColorMap = CShape.prototype.Get_ColorMap;
 CChartSpace.prototype.handleUpdateFill = function()
 {
     this.recalcInfo.recalculatePenBrush = true;
+    this.recalcInfo.recalculateBrush = true;
     this.recalcInfo.recalculateChart = true;
     this.addToRecalculate();
 };
 CChartSpace.prototype.handleUpdateLn = function()
 {
     this.recalcInfo.recalculatePenBrush = true;
+    this.recalcInfo.recalculatePen = true;
     this.recalcInfo.recalculateChart = true;
-    this.setRecalculateInfo();
     this.addToRecalculate();
 };