трек у линий (высота/ширина) 0

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

Excel/model/DrawingObjects/Overlay.js

@@ -923,6 +923,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;
 
@@ -1114,6 +1140,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;
 
@@ -1311,6 +1363,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;
 

Word/Drawing/Overlay.js

@@ -1039,6 +1039,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;
 
@@ -1230,6 +1256,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;
 
@@ -1427,6 +1479,32 @@ CAutoshapeTrack.prototype =
                     var ex2 = (x1 - x3) / _len_y;
                     var ey2 = (y1 - y3) / _len_y;
 
+                    var _bAbsX1 = Math.abs(ex1) < 0.01;
+                    var _bAbsY1 = Math.abs(ey1) < 0.01;
+                    var _bAbsX2 = Math.abs(ex2) < 0.01;
+                    var _bAbsY2 = Math.abs(ey2) < 0.01;
+
+                    if (_bAbsX2 && _bAbsY2)
+                    {
+                        if (_bAbsX1 && _bAbsY1)
+                        {
+                            ex1 = 1;
+                            ey1 = 0;
+                            ex2 = 0;
+                            ey2 = 1;
+                        }
+                        else
+                        {
+                            ex2 = -ey1;
+                            ey2 = ex1;
+                        }
+                    }
+                    else if (_bAbsX1 && _bAbsY1)
+                    {
+                        ex1 = ey2;
+                        ey1 = -ex2;
+                    }
+
                     var xc1 = (x1 + x2) / 2;
                     var yc1 = (y1 + y2) / 2;