Устранено падение для ранов в формулах на функции Create_FontMap. Сделано,...

Устранено падение для ранов в формулах на функции Create_FontMap. Сделано, чтобы заливка совместного редкатирования и комментирования заливала всегда всю формулу, а не ее часть (баг 27404).

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

Word/Editor/Math.js

@@ -1284,7 +1284,32 @@ ParaMath.prototype.Draw_HighLights = function(PDSH)
 
     if ( EndPos >= 1 )
     {
+        var Comm = PDSH.Save_Comm();
+        var Coll = PDSH.Save_Coll();
+
         this.Root.Draw_HighLights(PDSH, false);
+
+        var CommFirst = PDSH.Comm.Get_Next();
+        var CollFirst = PDSH.Coll.Get_Next();
+
+        PDSH.Load_Comm(Comm);
+        PDSH.Load_Coll(Coll);
+
+        if (null !== CommFirst)
+        {
+            var CommentsCount = PDSH.Comments.length;
+            var CommentId     = ( CommentsCount > 0 ? PDSH.Comments[CommentsCount - 1] : null );
+            var CommentsFlag  = PDSH.CommentsFlag;
+
+            var Bounds = this.Root.Get_Bounds();
+            Comm.Add(Bounds.Y, Bounds.Y + Bounds.H, Bounds.X, Bounds.X + Bounds.W, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
+        }
+
+        if (null !== CollFirst)
+        {
+            var Bounds = this.Root.Get_Bounds();
+            Coll.Add(Bounds.Y, Bounds.Y + Bounds.H, Bounds.X, Bounds.X + Bounds.W, 0, CollFirst.r, CollFirst.g, CollFirst.b);
+        }
     }
 };
 ParaMath.prototype.Draw_Elements = function(PDSE)

Word/Editor/Paragraph.js

@@ -12687,6 +12687,30 @@ CParagraphDrawStateHightlights.prototype =
                 break
             }
         }
+    },
+
+    Save_Coll : function()
+    {
+        var Coll = this.Coll;
+        this.Coll = new CParaDrawingRangeLines();
+        return Coll;
+    },
+
+    Save_Comm : function()
+    {
+        var Comm = this.Comm;
+        this.Comm = new CParaDrawingRangeLines();
+        return Comm;
+    },
+
+    Load_Coll : function(Coll)
+    {
+        this.Coll = Coll;
+    },
+
+    Load_Comm : function(Comm)
+    {
+        this.Comm = Comm;
     }
 };
 

Word/Editor/Run.js

@@ -1202,7 +1202,7 @@ ParaRun.prototype.Create_FontMap = function(Map, ArgSize)
 
             FontSize   = TextPr.FontSize;
 
-            if(null !== this.Parent && undefined !== this.Paragraph)
+            if(null !== this.Parent && undefined !== this.Parent && null !== this.Parent.ParaMath && undefined !== this.Parent.ParaMath)
                 TextPr.FontSize = this.Parent.ParaMath.ApplyArgSize(TextPr.FontSize, ArgSize.value);
         }
         else