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

7176634d · Oleg.Korshul · Alexander.Trofimov · 559c9e8c · 7176634d · 7176634d
Commit 7176634d authored Nov 01, 2013 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

Excel/model/DrawingObjects/ShapeDrawer.js Excel/model/DrawingObjects/ShapeDrawer.js +5 -0

Word/Drawing/ShapeDrawer.js Word/Drawing/ShapeDrawer.js +4 -0

No files found.
--- a/Excel/model/DrawingObjects/ShapeDrawer.js
+++ b/Excel/model/DrawingObjects/ShapeDrawer.js
@@ -1397,7 +1397,12 @@ CShapeDrawer.prototype =
                            rgba = { R: rgb.r, G: rgb.g, B: rgb.b, A: rgba.A };
                        }
                        if (rgba)
+                        {
+                            if (this.UniFill != null && this.UniFill.transparent != null && this.Graphics.ClearMode !== true)
+                                rgba.A = this.UniFill.transparent;
+                            
                            this.Graphics.b_color1(rgba.R, rgba.G, rgba.B, rgba.A);
+                        }
                    }
                }
            }

--- a/Word/Drawing/ShapeDrawer.js
+++ b/Word/Drawing/ShapeDrawer.js
@@ -1357,7 +1357,11 @@ CShapeDrawer.prototype =
                            rgba = { R: rgb.r, G: rgb.g, B: rgb.b, A: rgba.A };
                        }
                        if (rgba)
+                        {
+                            if (this.UniFill != null && this.UniFill.transparent != null)
+                                rgba.A = this.UniFill.transparent;
                            this.Graphics.b_color1(rgba.R, rgba.G, rgba.B, rgba.A);
+                        }
                    }
                }
            }