Улучшена проверка на попадание в Select (Selection_CheckParaContentPos) для формул

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

Word/Editor/Math.js

@@ -2852,20 +2852,18 @@ ParaMath.prototype.Get_Bounds = function()
 ParaMath.prototype.Get_JointSize = function()
 {
     var W = 0, H = 0;
-    if(this.bFirstRecalculate == true)
+
+    var _bounds = this.Get_Bounds();
+
+    for(var Line = 0; Line < _bounds.length; Line++)
     {
-        var _bounds = this.Get_Bounds();
+        if(_bounds[Line] === undefined)
+            break;
 
-        for(var Line = 0; Line < _bounds.length; Line++)
+        for(var Range = 0; Range < _bounds[Line].length; Range++)
         {
-            if(_bounds[Line] == undefined)
-                break;
-
-            for(var Range = 0; Range < _bounds[Line].length; Range++)
-            {
-                W += _bounds[Line][Range].W;
-                H += _bounds[Line][Range].H;
-            }
+            W += _bounds[Line][Range].W;
+            H += _bounds[Line][Range].H;
         }
     }
 

Word/Math/mathContent.js

@@ -3749,10 +3749,27 @@ CMathContent.prototype.Selection_CheckParaContentPos = function(ContentPos, Dept
 {
     var CurPos = ContentPos.Get(Depth);
 
-    if (this.Selection.StartPos <= CurPos && CurPos <= this.Selection.EndPos)
-        return this.Content[CurPos].Selection_CheckParaContentPos(ContentPos, Depth + 1, bStart && this.Selection.StartPos === CurPos, bEnd && CurPos === this.Selection.EndPos);
-    else if (this.Selection.EndPos <= CurPos && CurPos <= this.Selection.StartPos)
-        return this.Content[CurPos].Selection_CheckParaContentPos(ContentPos, Depth + 1, bStart && this.Selection.EndPos === CurPos, bEnd && CurPos === this.Selection.StartPos);
+    var bStartPos = this.Selection.StartPos,
+        bEndPos   = this.Selection.EndPos;
+
+    if(bStartPos > bEndPos)
+    {
+        var temp = bStartPos;
+        bStartPos = bEndPos;
+        bEndPos = temp;
+    }
+
+    if(bStartPos < CurPos)
+        bStart = false;
+
+    if(CurPos < bEndPos)
+        bEnd = false;
+
+
+    if(bStart === false && bEnd === false)
+        return true;
+    else if((bStartPos <= CurPos || bStart === false) && (CurPos <= bEndPos || bEnd === false))
+        return this.Content[CurPos].Selection_CheckParaContentPos(ContentPos, Depth + 1, bStart, bEnd);
 
     return false;
 };