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

Excel/model/DrawingObjects/Format/Format.js

@@ -2722,7 +2722,7 @@ CUniFill.prototype =
 
                 return RGBA;
             }
-            if (this.fill.type = FILL_TYPE_PATT)
+            if (this.fill.type == FILL_TYPE_PATT)
             {
                 return this.fill.fgClr.RGBA;
             }

PowerPoint/Editor/Format.js

@@ -1788,7 +1788,7 @@ CUniFill.prototype =
 
                 return RGBA;
             }
-            if (this.fill.type = FILL_TYPE_PATT)
+            if (this.fill.type == FILL_TYPE_PATT)
             {
                 return this.fill.fgClr.RGBA;
             }

PowerPoint/Editor/Format/GraphicFrame.js

@@ -1261,8 +1261,8 @@ CGraphicFrame.prototype =
 
                 if(layoutShapeStyle && layoutShapeStyle.TextPr && layoutShapeStyle.TextPr.unifill)
                 {
-                    layoutShapeStyle.unifill.calculate(theme, this.parent, layout, master, {R:0, G:0, B:0, A:0});
-                    var _rgba = layoutShapeStyle.unifill.getRGBAColor();
+                    layoutShapeStyle.TextPr.unifill.calculate(theme, this.parent, layout, master, {R:0, G:0, B:0, A:0});
+                    var _rgba = layoutShapeStyle.TextPr.unifill.getRGBAColor();
                     layoutShapeStyle.TextPr.Color =  new CDocumentColor(_rgba.R, _rgba.G, _rgba.B);
                 }
             }

Word/Drawing/Overlay.js

@@ -44,6 +44,11 @@ COverlay.prototype =
         if (null == this.m_oContext)
         {
             this.m_oContext = this.m_oControl.HtmlElement.getContext('2d');
+
+            this.m_oContext.imageSmoothingEnabled = false;
+            this.m_oContext.mozImageSmoothingEnabled = false;
+            this.m_oContext.oImageSmoothingEnabled = false;
+            this.m_oContext.webkitImageSmoothingEnabled = false;
         }
 
         this.m_oContext.beginPath();

Word/Editor/GraphicObjects/ObjectTypes/Format.js

@@ -1800,7 +1800,7 @@ CUniFill.prototype =
 
                 return RGBA;
             }
-            if (this.fill.type = FILL_TYPE_PATT)
+            if (this.fill.type == FILL_TYPE_PATT)
             {
                 return this.fill.fgClr.RGBA;
             }