git-svn-id:...

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

git-svn-id:...
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49434 954022d7-b5bf-4e40-9824-e11837661b57
216b4d3c · Oleg.Korshul · Alexander.Trofimov · 7826a3ce · 216b4d3c · 216b4d3c
Commit 216b4d3c authored Sep 05, 2013 by Oleg.Korshul Committed by Alexander.Trofimov May 18, 2016
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

Excel/model/DrawingObjects/ShapeDrawer.js Excel/model/DrawingObjects/ShapeDrawer.js +6 -1

Word/Drawing/ShapeDrawer.js Word/Drawing/ShapeDrawer.js +6 -1

No files found.
--- a/Excel/model/DrawingObjects/ShapeDrawer.js
+++ b/Excel/model/DrawingObjects/ShapeDrawer.js
@@ -1063,7 +1063,12 @@ CShapeDrawer.prototype =

        if (this.IsRectShape && this.Graphics.AddSmartRect !== undefined)
        {
+            if (undefined !== this.Shape.absExtX)
                this.Graphics.AddSmartRect(0, 0, this.Shape.absExtX, this.Shape.absExtY, this.StrokeWidth);
+            else if (undefined !== this.Shape.extX)
+                this.Graphics.AddSmartRect(0, 0, this.Shape.extX, this.Shape.extY, this.StrokeWidth);
+            else
+                this.Graphics.ds();
        }
        else
        {

--- a/Word/Drawing/ShapeDrawer.js
+++ b/Word/Drawing/ShapeDrawer.js
@@ -1061,7 +1061,12 @@ CShapeDrawer.prototype =

        if (this.IsRectShape && this.Graphics.AddSmartRect !== undefined)
        {
+            if (undefined !== this.Shape.absExtX)
                this.Graphics.AddSmartRect(0, 0, this.Shape.absExtX, this.Shape.absExtY, this.StrokeWidth);
+            else if (undefined !== this.Shape.extX)
+                this.Graphics.AddSmartRect(0, 0, this.Shape.extX, this.Shape.extY, this.StrokeWidth);
+            else
+                this.Graphics.ds();
        }
        else
        {