применение свойств для автофигур

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

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -649,6 +649,7 @@ DrawingObjectsController.prototype =
                 }
             }
         }
+		this.drawingObjects.showDrawingObjects(true);
 	}
 };
 

Excel/model/DrawingObjects/Format/Shape.js

@@ -232,13 +232,14 @@ CShape.prototype =
 
 	calculateFill: function()
     {
-        /*var theme = this.document.theme;
+		var api = window["Asc"]["editor"];
+        var theme = api.wbModel.theme;
         var brush;
-        var colorMap = this.document.clrSchemeMap.color_map;
+        var colorMap = api.wbModel.clrSchemeMap.color_map;
         var RGBA = {R: 0, G: 0, B: 0, A: 255};
         if (colorMap == null)
             colorMap = GenerateDefaultColorMap().color_map;
-        if (theme && this.style != null && this.style.fillRef!=null)
+        if (theme && this.style != null && this.style.fillRef != null)
         {
             brush = theme.getFillStyle(this.style.fillRef.idx);
             this.style.fillRef.Color.Calculate(theme, colorMap, {R:0, G:0, B:0, A:255});
@@ -260,15 +261,16 @@ CShape.prototype =
 
         brush.merge(this.spPr.Fill);
         this.brush = brush;
-        this.brush.calculate(theme, colorMap, RGBA);*/
+        this.brush.calculate(theme, colorMap, RGBA);
     },
 	
 	calculateLine: function()
     {
-        /*var _calculated_line;
-        var _theme = this.document.theme;
-        var colorMap = this.document.clrSchemeMap.color_map;
-        if(colorMap==null)
+		var api = window["Asc"]["editor"];
+        var _calculated_line;
+        var _theme = api.wbModel.theme;
+        var colorMap = api.wbModel.clrSchemeMap.color_map;
+        if (colorMap == null)
             colorMap = GenerateDefaultColorMap().color_map;
         var RGBA = {R: 0, G: 0, B: 0, A: 255};
         if(_theme !== null && typeof _theme === "object" && typeof _theme.getLnStyle === "function"
@@ -287,12 +289,12 @@ CShape.prototype =
 
         _calculated_line.merge(this.spPr.ln);
 
-        if(_calculated_line.Fill!=null)
+        if (_calculated_line.Fill!=null)
         {
             _calculated_line.Fill.calculate(_theme, colorMap, RGBA) ;
         }
 
-        this.pen = _calculated_line;*/
+        this.pen = _calculated_line;
     },
 	
     setPosition: function(x, y)