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

PowerPoint/apiCommon.js

@@ -394,14 +394,14 @@ function CAscFillSolid()
 {
     this.color = new CAscColor();
 }
-CAscFillSolid.prototype.get_color = function(){return this.color;}
+CAscFillSolid.prototype.get_color = function(){return this.color}
 CAscFillSolid.prototype.put_color = function(v){this.color = v;}
 
 function CAscFillHatch()
 {
-    this.PatternType = 0;
-    this.fgClr = new CAscColor();
-    this.bgClr = new CAscColor();
+    this.PatternType = undefined;
+    this.fgClr = undefined;
+    this.bgClr = undefined;
 }
 CAscFillHatch.prototype.get_pattern_type = function(){return this.PatternType;}
 CAscFillHatch.prototype.put_pattern_type = function(v){this.PatternType = v;}
@@ -412,8 +412,8 @@ CAscFillHatch.prototype.put_color_bg = function(v){this.bgClr = v;}
 
 function CAscFillGrad()
 {
-    this.Colors = new Array();
-    this.Positions = new Array();
+    this.Colors = undefined;
+    this.Positions = undefined;
     this.GradType = 0;
 
     this.LinearAngle = 0;
@@ -481,6 +481,12 @@ function CreateAscFill(unifill)
 
             for (var i = 0; i < _fill.colors.length; i++)
             {
+                if (0 == i)
+                {
+                    ret.fill.Colors = new Array();
+                    ret.fill.Positions = new Array();
+                }
+
                 ret.fill.Colors.push(CreateAscColor(_fill.colors[i].color));
                 ret.fill.Positions.push(_fill.colors[i].pos);
             }
@@ -573,7 +579,7 @@ function CorrectUniFill(asc_fill, unifill)
 
                 if (undefined != _fill.PatternType)
                 {
-                    ret.ftype = _fill.PatternType;
+                    ret.fill.ftype = _fill.PatternType;
                 }
                 if (undefined != _fill.fgClr)
                 {
@@ -611,6 +617,26 @@ function CorrectUniFill(asc_fill, unifill)
                         }
                     }
                 }
+                else if (undefined != _colors)
+                {
+                    if (_colors.length == ret.fill.colors.length)
+                    {
+                        for (var i = 0; i < _colors.length; i++)
+                        {
+                            ret.fill.colors[i].color = CorrectUniColor(_colors[i], ret.fill.colors[i].color);
+                        }
+                    }
+                }
+                else if (undefined != _positions)
+                {
+                    if (_positions.length == ret.fill.colors.length)
+                    {
+                        for (var i = 0; i < _positions.length; i++)
+                        {
+                            ret.fill.colors[i].pos = _positions[i];
+                        }
+                    }
+                }
 
                 var _grad_type = _fill.get_grad_type();