texture/gradient fill in diagrams

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

Excel/model/DrawingObjects/ShapeDrawer.js

@@ -815,8 +815,15 @@ CShapeDrawer.prototype =
         if (this.Graphics.IsSlideBoundsCheckerType === true)
             return;
 
+        var bIsIntegerGridTRUE = false;
         if (this.bIsTexture)
         {
+            if (this.Graphics.m_bIntegerGrid === true)
+            {
+                this.Graphics.SetIntegerGrid(false);
+                bIsIntegerGridTRUE = true;
+            }
+
             if (this.Graphics.RENDERER_PDF_FLAG)
             {
                 if (null == this.UniFill.fill.tile || this.Graphics.m_oContext === undefined)
@@ -827,6 +834,11 @@ CShapeDrawer.prototype =
                 {
                     this.Graphics.put_brushTexture(getFullImageSrc(this.UniFill.fill.RasterImageId), 1);
                 }
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
 
@@ -942,6 +954,11 @@ CShapeDrawer.prototype =
                     _ctx.restore();
                 }
             }
+
+            if (bIsIntegerGridTRUE)
+            {
+                this.Graphics.SetIntegerGrid(true);
+            }
             return;
         }
 
@@ -950,6 +967,12 @@ CShapeDrawer.prototype =
             var _fill = this.UniFill.fill;
             if (_fill.type == FILL_TYPE_PATT)
             {
+                if (this.Graphics.m_bIntegerGrid === true)
+                {
+                    this.Graphics.SetIntegerGrid(false);
+                    bIsIntegerGridTRUE = true;
+                }
+
                 var _is_ctx = false;
                 if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255))
                 {
@@ -1011,10 +1034,21 @@ CShapeDrawer.prototype =
                 }
 
                 _ctx.restore();
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
             else if (_fill.type == FILL_TYPE_GRAD)
             {
+                if (this.Graphics.m_bIntegerGrid === true)
+                {
+                    this.Graphics.SetIntegerGrid(false);
+                    bIsIntegerGridTRUE = true;
+                }
+
                 var _is_ctx = false;
                 if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255))
                 {
@@ -1065,6 +1099,11 @@ CShapeDrawer.prototype =
                 {
                     _ctx.fill();
                 }
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
         }

Word/Drawing/ShapeDrawer.js

@@ -775,8 +775,15 @@ CShapeDrawer.prototype =
         if (this.Graphics.IsSlideBoundsCheckerType === true)
             return;
 
+        var bIsIntegerGridTRUE = false;
         if (this.bIsTexture)
         {
+            if (this.Graphics.m_bIntegerGrid === true)
+            {
+                this.Graphics.SetIntegerGrid(false);
+                bIsIntegerGridTRUE = true;
+            }
+
             if (this.Graphics.RENDERER_PDF_FLAG)
             {
                 if (null == this.UniFill.fill.tile || this.Graphics.m_oContext === undefined)
@@ -787,6 +794,11 @@ CShapeDrawer.prototype =
                 {
                     this.Graphics.put_brushTexture(_getFullImageSrc(this.UniFill.fill.RasterImageId), 1);
                 }
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
 
@@ -901,6 +913,11 @@ CShapeDrawer.prototype =
                     _ctx.restore();
                 }
             }
+
+            if (bIsIntegerGridTRUE)
+            {
+                this.Graphics.SetIntegerGrid(true);
+            }
             return;
         }
 
@@ -909,6 +926,12 @@ CShapeDrawer.prototype =
             var _fill = this.UniFill.fill;
             if (_fill.type == FILL_TYPE_PATT)
             {
+                if (this.Graphics.m_bIntegerGrid === true)
+                {
+                    this.Graphics.SetIntegerGrid(false);
+                    bIsIntegerGridTRUE = true;
+                }
+
                 var _is_ctx = false;
                 if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255))
                 {
@@ -969,10 +992,21 @@ CShapeDrawer.prototype =
                 }
 
                 _ctx.restore();
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
             else if (_fill.type == FILL_TYPE_GRAD)
             {
+                if (this.Graphics.m_bIntegerGrid === true)
+                {
+                    this.Graphics.SetIntegerGrid(false);
+                    bIsIntegerGridTRUE = true;
+                }
+
                 var _is_ctx = false;
                 if (this.Graphics.IsNoSupportTextDraw === true || undefined === this.Graphics.m_oContext || (null == this.UniFill.transparent) || (this.UniFill.transparent == 255))
                 {
@@ -1023,6 +1057,11 @@ CShapeDrawer.prototype =
                 {
                     _ctx.fill();
                 }
+
+                if (bIsIntegerGridTRUE)
+                {
+                    this.Graphics.SetIntegerGrid(true);
+                }
                 return;
             }
         }