к заливке 60004

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

Word/Editor/Math.js

@@ -1052,15 +1052,11 @@ ParaMath.prototype.SetNeedResize = function()
 };
 ParaMath.prototype.SetRecalcCtrPrp = function(Class)
 {
-    if(this.Root.Content.length > 0)
+    if(this.Root.Content.length > 0 && this.ParaMathRPI.bRecalcCtrPrp == false)
     {
-        this.ParaMathRPI.RecalcCtrPrp = this.Root.Content[0] == Class;
+        this.ParaMathRPI.bRecalcCtrPrp = this.Root.Content[0] == Class;
     }
 };
-ParaMath.prototype.NeedCompiledCtrPr = function()
-{
-    this.Root.NeedCompiledCtrPr();
-};
 ParaMath.prototype.MathToImageConverter = function(bCopy, _canvasInput, _widthPx, _heightPx, raster_koef)
 {
     var bTurnOnId = false, bTurnOnHistory = false;

Word/Math/base.js

@@ -108,15 +108,6 @@ CMathBase.prototype =
 
         return CtrPrp;
     },
-    NeedCompiledCtrPr: function()
-    {
-        this.RecalcInfo.bCtrPrp = true;
-
-        for(var i=0; i < this.nRow; i++)
-            for(var j = 0; j < this.nCol; j++)
-                if(!this.elements[i][j].IsJustDraw())
-                    this.elements[i][j].NeedCompiledCtrPr();
-    },
     Get_CompiledCtrPrp: function(bAllowInline)
     {
         this.Set_CompiledCtrPrp(this.Parent, this.ParaMath);

Word/Math/mathContent.js

@@ -53,7 +53,7 @@ CRPI.prototype.Copy = function()
     RPI.bNaryInline     = this.bNaryInline;
     RPI.bEqqArray       = this.bEqqArray;
     RPI.bMathFunc       = this.bMathFunc;
-    RPI.RecalcCtrPrp    = this.bRecalcCtrPrp;
+    RPI.bRecalcCtrPrp    = this.bRecalcCtrPrp;
     RPI.PRS             = this.PRS;
 
     return RPI;
@@ -1426,8 +1426,8 @@ CMathContent.prototype =
 
             var FirstPos = this.Selection.Use ? Math.min(StartPos, EndPos) : this.CurPos;
 
-            if(FirstPos == 0)
-                this.ParaMath.NeedCompiledCtrPr();
+            if(FirstPos == 0 && this.bRoot)
+                this.ParaMath.SetRecalcCtrPrp(this.Content[0]);
 
             if( ( !this.Selection.Use && !bMenu ) || (bSelectOneElement && this.Content[StartPos].Type == para_Math_Run) ) // TextPr меняем только в одном Run
             {
@@ -1623,13 +1623,6 @@ CMathContent.prototype =
                 ContentPos.Data[Depth]++;
         }
     },
-    NeedCompiledCtrPr: function()
-    {
-        for(var i = 0; i < this.Content.length; i++)
-            if(this.Content[i].Type == para_Math_Composition)
-                this.Content[i].NeedCompiledCtrPr();
-
-    },
     private_CorrectSelectionPos : function()
     {
         this.Selection.Start = Math.max(0, Math.min(this.Content.length - 1, this.Selection.Start));