1. Поправила баг: падение на double-click в формуле

2. Поправила баг на поиске позиции: обновляю глубину для SearchPos в Run

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

Word/Editor/Math.js

@@ -1387,12 +1387,18 @@ ParaMath.prototype.Get_WordStartPos = function(SearchPos, ContentPos, Depth, Use
 {
     // TODO: ParaMath.Get_StartEndPos
     this.Root.Get_WordStartPos(SearchPos, ContentPos, Depth, UseContentPos, false);
+
+    SearchPos.Found = true;
+    SearchPos.UpdatePos = true;
 };
 
 ParaMath.prototype.Get_WordEndPos = function(SearchPos, ContentPos, Depth, UseContentPos, StepEnd)
 {
     // TODO: ParaMath.Get_WordEndPos
     this.Root.Get_WordEndPos(SearchPos, ContentPos, Depth, UseContentPos, StepEnd, false);
+
+    SearchPos.Found = true;
+    SearchPos.UpdatePos = true;
 };
 
 ParaMath.prototype.Get_EndRangePos = function(_CurLine, _CurRange, SearchPos, Depth)

Word/Math/accent.js

@@ -619,8 +619,8 @@ CAccent.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
 
     if(result)
     {
-        SearchPos.Pos.Update(0, Depth);
-        SearchPos.Pos.Update(0, Depth+1);
+        SearchPos.Pos.Update2(0, Depth);
+        SearchPos.Pos.Update2(0, Depth+1);
     }
 
     SearchPos.CurX += this.GapRight + align;

Word/Math/base.js

@@ -624,8 +624,8 @@ CMathBase.prototype =
 
         if(result)
         {
-            SearchPos.Pos.Update(CurrX, Depth);
-            SearchPos.Pos.Update(CurrY, Depth + 1);
+            SearchPos.Pos.Update2(CurrX, Depth);
+            SearchPos.Pos.Update2(CurrY, Depth + 1);
         }
 
         SearchPos.CurX = SearchCurX + this.size.width;

Word/Math/borderBox.js

@@ -285,8 +285,8 @@ CBorderBox.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
 
     if(result)
     {
-        SearchPos.Pos.Update(0, Depth);
-        SearchPos.Pos.Update(0, Depth + 1);
+        SearchPos.Pos.Update2(0, Depth);
+        SearchPos.Pos.Update2(0, Depth + 1);
     }
 
     SearchPos.CurX += this.GapRight + alignRight;

Word/Math/mathContent.js

@@ -4991,7 +4991,7 @@ CMathContent.prototype =
                 {
                     if( this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd))
                     {
-                        SearchPos.Pos.Update(pos, Depth);
+                        SearchPos.Pos.Update2(pos, Depth);
                         result = true;
                     }
 
@@ -5003,7 +5003,7 @@ CMathContent.prototype =
 
                             if( this.content[pos-1].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd))
                             {
-                                SearchPos.Pos.Update(pos-1, Depth);
+                                SearchPos.Pos.Update2(pos-1, Depth);
                                 result = true;
                             }
 
@@ -5014,7 +5014,7 @@ CMathContent.prototype =
                         {
                             if( this.content[pos+1].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd))
                             {
-                                SearchPos.Pos.Update(pos, Depth);
+                                SearchPos.Pos.Update2(pos, Depth);
                                 result = true;
                             }
                         }*/
@@ -5024,7 +5024,7 @@ CMathContent.prototype =
                 {
                     if(this.content[pos].Get_ParaContentPosByXY(SearchPos, Depth+1, _CurLine, _CurRange, StepEnd, PointInfo))
                     {
-                        SearchPos.Pos.Update(pos, Depth);
+                        SearchPos.Pos.Update2(pos, Depth);
                         result = true;
                     }
                 }

Word/Math/mathText.js

@@ -787,7 +787,7 @@ CMathText.prototype =
     },
     Get_ParaContentPosByXY: function(SearchPos, Depth, _CurLine, _CurRange, StepEnd)
     {
-        SearchPos.Pos.Update(0, Depth);
+        SearchPos.Pos.Update2(0, Depth);
         SearchPos.Pos.bPlaceholder = true;
     },
     Copy: function()

Word/Math/matrix.js

@@ -299,8 +299,8 @@ CMathMatrix.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLi
 
     if(result)
     {
-        SearchPos.Pos.Update(CurrX, Depth);
-        SearchPos.Pos.Update(CurrY, Depth + 1);
+        SearchPos.Pos.Update2(CurrX, Depth);
+        SearchPos.Pos.Update2(CurrY, Depth + 1);
     }
 
     SearchPos.CurX = PrevSearchCurX + this.size.width;

Word/Math/operators.js

@@ -3588,8 +3588,8 @@ CDelimiter.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
     {
         if(this.elements[0][j].Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd))
         {
-            SearchPos.Pos.Update(0, Depth);
-            SearchPos.Pos.Update(j, Depth+1);
+            SearchPos.Pos.Update2(0, Depth);
+            SearchPos.Pos.Update2(j, Depth+1);
             result = true;
         }
 
@@ -3813,8 +3813,8 @@ CCharacter.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLin
 
     if(result)
     {
-        SearchPos.Pos.Update(0, Depth);
-        SearchPos.Pos.Update(0, Depth+1);
+        SearchPos.Pos.Update2(0, Depth);
+        SearchPos.Pos.Update2(0, Depth+1);
     }
 
     SearchPos.CurX += this.GapRight + align;

Word/Math/radical.js

@@ -1180,8 +1180,8 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
         SearchPos.CurX += this.size.width - this.Base.size.width - this.GapRight;
         if(this.Base.Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd))
         {
-            SearchPos.Pos.Update(0, Depth);
-            SearchPos.Pos.Update(0, Depth + 1);
+            SearchPos.Pos.Update2(0, Depth);
+            SearchPos.Pos.Update2(0, Depth + 1);
             result = true;
         }
         SearchPos.CurX += this.GapRight;
@@ -1191,8 +1191,8 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
         SearchPos.CurX += this.GapLeft;
         if(this.Iterator.Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd))
         {
-            SearchPos.Pos.Update(0, Depth);
-            SearchPos.Pos.Update(0, Depth + 1);
+            SearchPos.Pos.Update2(0, Depth);
+            SearchPos.Pos.Update2(0, Depth + 1);
             result = true;
         }
 
@@ -1200,8 +1200,8 @@ CRadical.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
 
         if(this.Base.Get_ParaContentPosByXY(SearchPos, Depth+2, _CurLine, _CurRange, StepEnd))
         {
-            SearchPos.Pos.Update(0, Depth);
-            SearchPos.Pos.Update(1, Depth + 1);
+            SearchPos.Pos.Update2(0, Depth);
+            SearchPos.Pos.Update2(1, Depth + 1);
             result = true;
         }