Исправлен баг с неправильными кодами для некоторых скобок. Исправлен баг с...

Исправлен баг с неправильными кодами для некоторых скобок. Исправлен баг с позиционированием курсора при обработке добавления новых строк в формуле.

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

Word/Editor/Math.js

@@ -1730,14 +1730,11 @@ ParaMath.prototype.Handle_AddNewLine = function()
 
         // остаим пустой Run в Content, чтобы не упала ф-ия Remove_FromContent
         // первый элемент всегда Run
-
         var Run = CurrContent.getElem(0);
         Run.Remove_FromContent(0, Run.Content.length, true);
 
         CurrContent.Remove_FromContent(1, CurrContent.Content.length);
-
         CurrContent.Add_ToContent(1, EqArray);
-
         CurrContent.Correct_Content(true);
 
         var CurrentContent = new CParagraphContentPos();
@@ -1747,6 +1744,9 @@ ParaMath.prototype.Handle_AddNewLine = function()
         this.Get_RightPos(RightContentPos, CurrentContent, 0, true);
         this.Set_ParaContentPos(RightContentPos.Pos, 0);
 
+        EqArray.CurPos = 1;
+        SecondContent.Cursor_MoveToStartPos();
+
         NeedRecalculate = true;
     }
 

Word/Editor/ParagraphContent.js

@@ -694,6 +694,9 @@ ParaTextPr.prototype =
         if ( undefined != this.Value.Color )
             this.Set_Color( undefined );
 
+        if ( undefined != this.Value.Unifill )
+            this.Set_Unifill( undefined );
+
         if ( undefined != this.Value.VertAlign )
             this.Set_VertAlign( undefined );
 

Word/Math/mathContent.js

@@ -2408,8 +2408,8 @@ CMathContent.prototype.private_LoadFromMenuBracket = function(Type, Pr)
         case c_oAscMathType.Bracket_Square                : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    91,    93); break;
         case c_oAscMathType.Bracket_Curve                 : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],   123,   125); break;
         case c_oAscMathType.Bracket_Angle                 : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 10216, 10217); break;
-        case c_oAscMathType.Bracket_LowLim                : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  9123,  9126); break;
-        case c_oAscMathType.Bracket_UppLim                : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  9121,  9124); break;
+        case c_oAscMathType.Bracket_LowLim                : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 0x230A, 0x230B); break;
+        case c_oAscMathType.Bracket_UppLim                : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 0x2308, 0x2309); break;
         case c_oAscMathType.Bracket_Line                  : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],   124,   124); break;
         case c_oAscMathType.Bracket_LineDouble            : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  8214,  8214); break;
         case c_oAscMathType.Bracket_Square_OpenOpen       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    91,    91); break;
@@ -2430,10 +2430,10 @@ CMathContent.prototype.private_LoadFromMenuBracket = function(Type, Pr)
         case c_oAscMathType.Bracket_Curve_NoneOpen        : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,   125); break;
         case c_oAscMathType.Bracket_Angle_OpenNone        : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 10216,    -1); break;
         case c_oAscMathType.Bracket_Angle_NoneOpen        : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1, 10217); break;
-        case c_oAscMathType.Bracket_LowLim_OpenNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  9123,    -1); break;
-        case c_oAscMathType.Bracket_LowLim_NoneNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,  9126); break;
-        case c_oAscMathType.Bracket_UppLim_OpenNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  9121,    -1); break;
-        case c_oAscMathType.Bracket_UppLim_NoneOpen       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,  9124); break;
+        case c_oAscMathType.Bracket_LowLim_OpenNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 0x230A,    -1); break;
+        case c_oAscMathType.Bracket_LowLim_NoneNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,  0x230B); break;
+        case c_oAscMathType.Bracket_UppLim_OpenNone       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null], 0x2308,    -1); break;
+        case c_oAscMathType.Bracket_UppLim_NoneOpen       : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,  0x2309); break;
         case c_oAscMathType.Bracket_Line_OpenNone         : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],   124,    -1); break;
         case c_oAscMathType.Bracket_Line_NoneOpen         : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],    -1,   124); break;
         case c_oAscMathType.Bracket_LineDouble_OpenNone   : this.Add_DelimiterEx(Pr.ctrPrp, 1, [null],  8214,    -1); break;
@@ -2627,7 +2627,7 @@ CMathContent.prototype.private_LoadFromMenuLimitLog = function(Type, Pr)
             break;
 
         case c_oAscMathType.LimitLog_Custom_2:
-            var Function = this.Add_FunctionWithLimit(Pr, "lim", "0" + String.fromCharCode(8804) + "x" + String.fromCharCode(8804) + "1", null);
+            var Function = this.Add_FunctionWithLimit(Pr, "max", "0" + String.fromCharCode(8804) + "x" + String.fromCharCode(8804) + "1", null);
             var MathContent = Function.getArgument();
             MathContent.Add_Text("x");
             var Script = MathContent.Add_Script(false, {ctrPrp : Pr.ctrPrp, type : DEGREE_SUPERSCRIPT}, "e", null, null);