Поправила баг возникающий при drag&drop на сравнении позиций (=> SearchPos.InTextPos.Update)

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

Word/Math/accent.js

@@ -621,6 +621,11 @@ CAccent.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
     {
         SearchPos.Pos.Update2(0, Depth);
         SearchPos.Pos.Update2(0, Depth+1);
+
+
+        SearchPos.InTextPos.Update(0, Depth);
+        SearchPos.InTextPos.Update(0, Depth + 1);
+
     }
 
     SearchPos.CurX += this.GapRight + align;

Word/Math/base.js

@@ -626,6 +626,10 @@ CMathBase.prototype =
         {
             SearchPos.Pos.Update2(CurrX, Depth);
             SearchPos.Pos.Update2(CurrY, Depth + 1);
+
+            SearchPos.InTextPos.Update(CurrX, Depth);
+            SearchPos.InTextPos.Update(CurrY, Depth + 1);
+
         }
 
         SearchPos.CurX = SearchCurX + this.size.width;

Word/Math/borderBox.js

@@ -287,6 +287,11 @@ CBorderBox.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
     {
         SearchPos.Pos.Update2(0, Depth);
         SearchPos.Pos.Update2(0, Depth + 1);
+
+
+        SearchPos.InTextPos.Update(0, Depth);
+        SearchPos.InTextPos.Update(0, Depth + 1);
+
     }
 
     SearchPos.CurX += this.GapRight + alignRight;

Word/Math/mathContent.js

@@ -1899,6 +1899,8 @@ CMathContent.prototype =
                 {
                     if( this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd))
                     {
+
+                        SearchPos.InTextPos.Update(pos, Depth);
                         SearchPos.Pos.Update2(pos, Depth);
                         result = true;
                     }
@@ -1932,6 +1934,8 @@ CMathContent.prototype =
                 {
                     if(this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd, PointInfo))
                     {
+
+                        SearchPos.InTextPos.Update(pos, Depth);
                         SearchPos.Pos.Update2(pos, Depth);
                         result = true;
                     }
@@ -2401,13 +2405,6 @@ CMathContent.prototype =
             var curType = this.content[CurPos].Type,
                 prevType = CurPos > 0 ? this.content[CurPos - 1].Type : null;
 
-            /*if(curType == MATH_PLACEHOLDER)
-            {
-                SearchPos.Pos.Update(0, Depth + 1);
-                SearchPos.Found = true;
-
-            }
-            else*/
             if(curType == para_Math_Composition)
             {
                 var bNotshift     = SearchPos.ForSelection == false,
@@ -2452,13 +2449,6 @@ CMathContent.prototype =
             var curType = this.content[CurPos].Type,
                 nextType = CurPos < this.content.length - 1 ? this.content[CurPos + 1].Type : null;
 
-            /*if(curType == MATH_PLACEHOLDER)
-            {
-                SearchPos.Pos.Update(0, Depth + 1);
-                SearchPos.Found = true;
-            }
-            else */
-
             if(curType == para_Math_Composition)
             {
                 var bNotshift     = SearchPos.ForSelection == false,

Word/Math/matrix.js

@@ -301,6 +301,10 @@ CMathMatrix.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLi
     {
         SearchPos.Pos.Update2(CurrX, Depth);
         SearchPos.Pos.Update2(CurrY, Depth + 1);
+
+        SearchPos.InTextPos.Update(CurrX, Depth);
+        SearchPos.InTextPos.Update(CurrY, Depth + 1);
+
     }
 
     SearchPos.CurX = PrevSearchCurX + this.size.width;

Word/Math/operators.js

@@ -3590,6 +3590,10 @@ CDelimiter.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
         {
             SearchPos.Pos.Update2(0, Depth);
             SearchPos.Pos.Update2(j, Depth+1);
+
+            SearchPos.InTextPos.Update(0, Depth);
+            SearchPos.InTextPos.Update(j, Depth + 1);
+
             result = true;
         }
 
@@ -3815,6 +3819,11 @@ CCharacter.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
     {
         SearchPos.Pos.Update2(0, Depth);
         SearchPos.Pos.Update2(0, Depth+1);
+
+
+        SearchPos.InTextPos.Update(0, Depth);
+        SearchPos.InTextPos.Update(0, Depth + 1);
+
     }
 
     SearchPos.CurX += this.GapRight + align;

Word/Math/radical.js

@@ -1182,6 +1182,12 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
         {
             SearchPos.Pos.Update2(0, Depth);
             SearchPos.Pos.Update2(0, Depth + 1);
+
+
+            SearchPos.InTextPos.Update(0, Depth);
+            SearchPos.InTextPos.Update(0, Depth + 1);
+
+
             result = true;
         }
         SearchPos.CurX += this.GapRight;
@@ -1193,6 +1199,12 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
         {
             SearchPos.Pos.Update2(0, Depth);
             SearchPos.Pos.Update2(0, Depth + 1);
+
+
+            SearchPos.InTextPos.Update(0, Depth);
+            SearchPos.InTextPos.Update(0, Depth + 1);
+
+
             result = true;
         }
 
@@ -1202,6 +1214,11 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
         {
             SearchPos.Pos.Update2(0, Depth);
             SearchPos.Pos.Update2(1, Depth + 1);
+
+
+            SearchPos.InTextPos.Update(0, Depth);
+            SearchPos.InTextPos.Update(1, Depth + 1);
+
             result = true;
         }