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

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -1430,7 +1430,7 @@ function CorrectUniColorEx(asc_color, unicolor) {
             {
                 ret.setColor(new CRGBColor());
             }
-            ret.color.setColor(asc_color.asc_getR()*16*16 + asc_color.asc_getG()*16 + asc_color.asc_getB());
+            ret.color.setColor(((asc_color.asc_getR() << 16) & 0xFF0000) + ((asc_color.asc_getG() << 8) & 0xFF00) + asc_color.asc_getB());
         }
     }
     return ret;
@@ -1531,7 +1531,7 @@ function asc_CFillGrad() {
     this.Positions = undefined;
     this.GradType = 0;
 
-    this.LinearAngle = 0;
+    this.LinearAngle = undefined;
     this.LinearScale = true;
 
     this.PathType = 0;

Excel/model/DrawingObjects/Format/ChartLegend.js

@@ -153,7 +153,7 @@ CChartLegend.prototype =
                 uni_fill.setFill(new CSolidFill());
                 uni_fill.fill.setColor(new CUniColor());
                 uni_fill.fill.color.setColor(new CRGBColor());
-                uni_fill.fill.color.setColor(cur_legend_info.color.R*16*16 + cur_legend_info.color.G*16 +cur_legend_info.color.B);
+                uni_fill.fill.color.setColor(cur_legend_info.color.R*256*256 + cur_legend_info.color.G*256 +cur_legend_info.color.B);
                 if(bullet_type === "line")
                 {
                     entry.bullet.setPresetGeometry("line");

Excel/model/DrawingObjects/Format/Format.js

@@ -882,7 +882,7 @@ CRGBColor.prototype =
     setColor: function(RGB)
     {
 
-        var oldValue = this.RGBA.R*16*16 + this.RGBA.G*16 + this.RGBA.B;
+        var oldValue = ((this.RGBA.R << 16) & 0xFF0000) + ((this.RGBA.G << 8) & 0xFF00) + this.RGBA.B;
         var newValue = RGB;
         History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_SetFType, null, null,
             new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataGOSingleProp(oldValue, newValue)));
@@ -894,7 +894,7 @@ CRGBColor.prototype =
     Copy: function()
     {
         var ret = new CRGBColor();
-        ret.setColor(this.RGBA.R*16*16 + this.RGBA.G*16 + this.RGBA.B);
+        ret.setColor(((this.RGBA.R << 16) & 0xFF0000) + ((this.RGBA.G << 8) & 0xFF00) + this.RGBA.B);
         return ret;
     },
 

Excel/model/DrawingObjects/Format/ParagraphContent.js

@@ -645,12 +645,12 @@ ParaTextPr.prototype =
         var oldValue = null;
         if(isRealObject(this.Value.Color))
         {
-            oldValue = this.Value.Color.r*16*16 + this.Value.Color.g*16 + this.Value.Color.b
+            oldValue = this.Value.Color.r*256*256 + this.Value.Color.g*256 + this.Value.Color.b;
         }
         var newValue = null;
         if(isRealObject(Value))
         {
-            newValue = Value.r*16*16 + Value.g*16 + Value.b
+            newValue = Value.r*256*256 + Value.g*256 + Value.b
         }
         if ( undefined != Value )
             this.Value.Color = Value;

Excel/model/DrawingObjects/Format/Shape.js

@@ -2990,7 +2990,7 @@ function CorrectUniColor2(asc_color, unicolor)
             {
                 ret.setColor(new CRGBColor());
             }
-            ret.color.setColor(asc_color.get_r()*16*16 + asc_color.get_g()*16 + asc_color.get_b());
+            ret.color.setColor(asc_color.get_r()*256*256 + asc_color.get_g()*256 + asc_color.get_b());
             /*ret.color.RGBA.R = asc_color.get_r();
             ret.color.RGBA.G = asc_color.get_g();
             ret.color.RGBA.B = asc_color.get_b();

PowerPoint/apiCommon.js

@@ -416,7 +416,7 @@ function CAscFillGrad()
     this.Positions = undefined;
     this.GradType = 0;
 
-    this.LinearAngle = 0;
+    this.LinearAngle = undefined;
     this.LinearScale = true;
 
     this.PathType = 0;

Word/apiCommon.js

@@ -272,7 +272,7 @@ function CAscFillGrad()
     this.Positions = undefined;
     this.GradType = 0;
 
-    this.LinearAngle = 0;
+    this.LinearAngle = undefined;
     this.LinearScale = true;
 
     this.PathType = 0;