Сделано, чтобы цвета изменений в рецензировании соответствовали цвету пользователя.

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

Word/Editor/Paragraph.js

@@ -15,9 +15,7 @@ var type_Paragraph = 0x0001;
 
 var UnknownValue  = null;
 
-//var REVIEW_COLOR = {r : 255, g : 0, b : 58};
-//var REVIEW_COLOR = {r : 204, g : 51, b : 0};
-var REVIEW_COLOR = {r : 255, g : 0, b : 0};
+var REVIEW_COLOR = new CColor(255, 0, 0, 255);
 
 // Класс Paragraph
 function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit, bFromPresentation)
@@ -1501,7 +1499,8 @@ Paragraph.prototype =
                     var Y_top    = this.Pages[CurPage].Bounds.Top;
                     var Y_bottom = this.Pages[CurPage].Bounds.Bottom;
 
-                    pGraphics.p_color(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+                    var ReviewColor = this.Get_PrReviewColor();
+                    pGraphics.p_color(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
                     pGraphics.drawVerLine(0, X_min, Y_top, Y_bottom, 0);
                 }
             }
@@ -2123,6 +2122,7 @@ Paragraph.prototype =
 
         var RunPrReview = null;
 
+        var arrRunReviewAreasColors = [];
         var arrRunReviewAreas = [];
         var arrRunReviewRects = [];
         for ( var CurLine = StartLine; CurLine <= EndLine; CurLine++ )
@@ -2231,7 +2231,7 @@ Paragraph.prototype =
                     RunPrReview = Element.Additional.RunPr;
                     arrRunReviewRects = [];
                     arrRunReviewAreas.push(arrRunReviewRects);
-
+                    arrRunReviewAreasColors.push(new CDocumentColor(Element.r, Element.g, Element.b));
                 }
 
                 arrRunReviewRectsLine.push({X : Element.x0, Y : Page.Y + Line.Y - Line.Metrics.TextAscent, W : Element.x1 - Element.x0, H : Line.Metrics.TextDescent + Line.Metrics.TextAscent + Line.Metrics.LineGap, Page : 0});
@@ -2275,10 +2275,11 @@ Paragraph.prototype =
             for (var ReviewAreaIndex = 0, ReviewAreasCount = arrRunReviewAreas.length; ReviewAreaIndex < ReviewAreasCount; ++ReviewAreaIndex)
             {
                 var arrRunReviewRects = arrRunReviewAreas[ReviewAreaIndex];
+                var oRunReviewColor = arrRunReviewAreasColors[ReviewAreaIndex];
                 var ReviewPolygon = new CPolygon();
                 ReviewPolygon.fill(arrRunReviewRects);
                 var PolygonPaths = ReviewPolygon.GetPaths(0);
-                pGraphics.p_color(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+                pGraphics.p_color(oRunReviewColor.r, oRunReviewColor.g, oRunReviewColor.b, 255);
                 for (var PolygonIndex = 0, PolygonsCount = PolygonPaths.length; PolygonIndex < PolygonsCount; ++PolygonIndex)
                 {
                     var Path = PolygonPaths[PolygonIndex];
@@ -13261,6 +13262,13 @@ Paragraph.prototype.Have_PrChange = function()
 {
     return this.Pr.Have_PrChange();
 };
+Paragraph.prototype.Get_PrReviewColor = function()
+{
+    if (this.Pr.ReviewInfo)
+        return this.Pr.ReviewInfo.Get_Color();
+
+    return REVIEW_COLOR;
+};
 Paragraph.prototype.Accept_PrChange = function()
 {
     this.Remove_PrChange();

Word/Editor/Run.js

@@ -4277,9 +4277,11 @@ ParaRun.prototype.Draw_Elements = function(PDSE)
 
     var RGBA;
     var ReviewType  = this.Get_ReviewType();
+    var ReviewColor = null;
     if (reviewtype_Add === ReviewType || reviewtype_Remove === ReviewType)
     {
-        pGraphics.b_color1(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+        ReviewColor = this.Get_ReviewColor();
+        pGraphics.b_color1(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
     }
     else if (CurTextPr.Unifill)
     {
@@ -4364,7 +4366,7 @@ ParaRun.prototype.Draw_Elements = function(PDSE)
 
                     if (reviewtype_Add === ReviewType || reviewtype_Remove === ReviewType)
                     {
-                        pGraphics.b_color1(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+                        pGraphics.b_color1(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
                     }
                     else if (RGBA)
                     {
@@ -4411,7 +4413,7 @@ ParaRun.prototype.Draw_Elements = function(PDSE)
                     if (reviewtype_Common !== ReviewType)
                     {
                         pGraphics.SetTextPr(EndTextPr, PDSE.Theme);
-                        pGraphics.b_color1(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+                        pGraphics.b_color1(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
                     }
                     else if (EndTextPr.Unifill)
                     {
@@ -4528,6 +4530,7 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
     var ReviewType  = this.Get_ReviewType();
     var bAddReview  = reviewtype_Add === ReviewType ? true : false;
     var bRemReview  = reviewtype_Remove === ReviewType ? true : false;
+    var ReviewColor = this.Get_ReviewColor();
 
     // Выставляем цвет обводки
     if ( true === PDSL.VisitedHyperlink && ( undefined === this.Pr.Color && undefined === this.Pr.Unifill ) )
@@ -4593,9 +4596,9 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
                 if (this.Paragraph)
                 {
                     if (bAddReview)
-                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                     else if (bRemReview)
-                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                 }
 
                 X += ItemWidthVisible;
@@ -4617,14 +4620,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
                 if ( para_Drawing != ItemType || drawing_Anchor != Item.DrawingType )
                 {
                     if (true === bRemReview)
-                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                     else if (true === CurTextPr.DStrikeout)
                         aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
                     else if ( true === CurTextPr.Strikeout )
                         aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
 
                     if (true === bAddReview)
-                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                     else if (true === CurTextPr.Underline)
                         aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
 
@@ -4642,14 +4645,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
                 if ( PDSL.Spaces > 0 )
                 {
                     if (true === bRemReview)
-                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                     else if (true === CurTextPr.DStrikeout)
                         aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr  );
                     else if ( true === CurTextPr.Strikeout )
                         aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr  );
 
                     if (true === bAddReview)
-                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+                        aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
                     else if (true === CurTextPr.Underline)
                         aUnderline.Add( UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
 
@@ -4665,7 +4668,7 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
             case para_Math_Ampersand:
             {
                 if (true === bRemReview)
-                    aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, undefined, CurTextPr );
+                    aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b, undefined, CurTextPr );
                 else if (true === CurTextPr.DStrikeout)
                     aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
                 else if ( true === CurTextPr.Strikeout )
@@ -4679,7 +4682,7 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
             {
                 var ctrPrp = this.Parent.GetCtrPrp();
                 if (true === bRemReview)
-                    aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, undefined, CurTextPr );
+                    aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b, undefined, CurTextPr );
                 if(true === ctrPrp.DStrikeout)
                     aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
                 else if(true === ctrPrp.Strikeout)
@@ -4695,7 +4698,10 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
     }
 
     if (true === this.Pr.Have_PrChange() && para_Math_Run !== this.Type)
-        PDSL.RunReview.Add(0, 0, PDSL.X, X, 0, 255, 0, 0, {RunPr : this.Pr});
+    {
+        var ReviewColor = this.Get_PrReviewColor();
+        PDSL.RunReview.Add(0, 0, PDSL.X, X, 0, ReviewColor.r, ReviewColor.g, ReviewColor.b, {RunPr: this.Pr});
+    }
 
     var CollPrChangeColor = this.private_GetCollPrChangeOther();
     if (false !== CollPrChangeColor)
@@ -6401,6 +6407,14 @@ ParaRun.prototype.Have_PrChange = function()
     return this.Pr.Have_PrChange();
 };
 
+ParaRun.prototype.Get_PrReviewColor = function()
+{
+    if (this.Pr.ReviewInfo)
+        return this.Pr.ReviewInfo.Get_Color();
+
+    return REVIEW_COLOR;
+};
+
 ParaRun.prototype.Add_PrChange = function()
 {
     if (false === this.Have_PrChange())
@@ -10070,6 +10084,13 @@ ParaRun.prototype.Get_ReviewType = function()
 {
     return this.ReviewType;
 };
+ParaRun.prototype.Get_ReviewColor = function()
+{
+    if (this.ReviewInfo)
+        return this.ReviewInfo.Get_Color();
+
+    return REVIEW_COLOR;
+};
 ParaRun.prototype.Set_ReviewType = function(Value)
 {
     if (Value !== this.ReviewType)
@@ -10531,3 +10552,10 @@ CReviewInfo.prototype.Read_FromBinary = function(Reader)
     this.UserName = Reader.GetString2();
     this.DateTime = parseInt(Reader.GetString2());
 };
+CReviewInfo.prototype.Get_Color = function()
+{
+    if (!this.UserId && !this.UserName)
+        return REVIEW_COLOR;
+
+    return getUserColorById(this.UserId, this.UserName, true, false);
+};
\ No newline at end of file

Word/Math/base.js

@@ -1785,6 +1785,9 @@ CMathBase.prototype.Draw_Lines = function(PDSL)
     var ReviewType = this.Get_ReviewType();
     var bAddReview = reviewtype_Add === ReviewType ? true : false;
     var bRemReview = reviewtype_Remove === ReviewType ? true : false;
+    var ReviewColor = null;
+    if (bAddReview || bRemReview)
+        ReviewColor = this.ReviewInfo.Get_Color();
 
     var ArgSize     = this.Get_CompiledArgSize();
     var fontCoeff   = MatGetKoeffArgSize(CtrPrp.FontSize, ArgSize.value);
@@ -1828,7 +1831,7 @@ CMathBase.prototype.Draw_Lines = function(PDSL)
     var Bound = this.Bounds.Get_LineBound(CurLine, CurRange);
 
     if (true === bRemReview)
-        aStrikeout.Add(Y, Y, X, X + Bound.W, LineW, REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b);
+        aStrikeout.Add(Y, Y, X, X + Bound.W, LineW, ReviewColor.r, ReviewColor.g, ReviewColor.b);
     else if ( true === CtrPrp.DStrikeout )
         aDStrikeout.Add( Y, Y, X, X + Bound.W, LineW, CurColor.r, CurColor.g, CurColor.b );
     else if ( true === CtrPrp.Strikeout )
@@ -1912,8 +1915,9 @@ CMathBase.prototype.Make_ShdColor = function(PDSE, CurTextPr)
 
     if (reviewtype_Common !== this.Get_ReviewType())
     {
-        pGraphics.p_color(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
-        pGraphics.b_color1(REVIEW_COLOR.r, REVIEW_COLOR.g, REVIEW_COLOR.b, 255);
+        var ReviewColor = this.Get_ReviewColor();
+        pGraphics.p_color(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
+        pGraphics.b_color1(ReviewColor.r, ReviewColor.g, ReviewColor.b, 255);
     }
 
     if(BgColor == undefined)
@@ -2397,6 +2401,22 @@ CMathBase.prototype.Get_ReviewType = function()
 
     return reviewtype_Common;
 };
+CMathBase.prototype.Get_ReviewColor = function()
+{
+    if (this.Id)
+    {
+        if (this.ReviewInfo)
+            return this.ReviewInfo.Get_Color();
+        else
+            return new CDocumentColor(255, 0, 0);
+    }
+    else if (this.Parent && this.Parent.Get_ReviewColor)
+    {
+        return this.Parent.Get_ReviewColor();
+    }
+
+    return REVIEW_COLOR;
+};
 CMathBase.prototype.Set_ReviewType = function(Type)
 {
     if (!this.Id)