fix bug 21042

common/Drawings/Format/ChartSpace.js

@@ -364,6 +364,7 @@ function checkFiniteNumber(num)
 }
 
 var G_O_VISITED_HLINK_COLOR = CreateUniFillSolidFillWidthTintOrShade(CreateUnifillSolidFillSchemeColorByIndex(10), 0);
+var G_O_HLINK_COLOR = CreateUniFillSolidFillWidthTintOrShade(CreateUnifillSolidFillSchemeColorByIndex(11), 0);
 var G_O_NO_ACTIVE_COMMENT_BRUSH = AscFormat.CreateUniFillByUniColor(AscFormat.CreateUniColorRGB(248, 231, 195));
 var G_O_ACTIVE_COMMENT_BRUSH = AscFormat.CreateUniFillByUniColor(AscFormat.CreateUniColorRGB(240, 200, 120));
 /*function addPointToMap(map, worksheet, row, col, pt)
@@ -13385,6 +13386,7 @@ function checkBlipFillRasterImages(sp)
     window['AscFormat'].CreateUnifillSolidFillSchemeColorByIndex = CreateUnifillSolidFillSchemeColorByIndex;
     window['AscFormat'].CreateUniFillSchemeColorWidthTint = CreateUniFillSchemeColorWidthTint;
     window['AscFormat'].G_O_VISITED_HLINK_COLOR = G_O_VISITED_HLINK_COLOR;
+    window['AscFormat'].G_O_HLINK_COLOR = G_O_HLINK_COLOR;
     window['AscFormat'].G_O_NO_ACTIVE_COMMENT_BRUSH = G_O_NO_ACTIVE_COMMENT_BRUSH;
     window['AscFormat'].G_O_ACTIVE_COMMENT_BRUSH = G_O_ACTIVE_COMMENT_BRUSH;
     window['AscFormat'].CChartSpace = CChartSpace;

word/Editor/Hyperlink.js

@@ -197,15 +197,19 @@ ParaHyperlink.prototype.CopyContent = function(Selected)
 ParaHyperlink.prototype.Draw_Elements = function(PDSE)
 {
     PDSE.VisitedHyperlink = this.Visited;
+    PDSE.Hyperlink = true;
     CParagraphContentWithParagraphLikeContent.prototype.Draw_Elements.apply(this, arguments);
     PDSE.VisitedHyperlink = false;
+    PDSE.Hyperlink = false;
 };
 
 ParaHyperlink.prototype.Draw_Lines = function(PDSL)
 {
     PDSL.VisitedHyperlink = this.Visited;
+    PDSL.Hyperlink = true;
     CParagraphContentWithParagraphLikeContent.prototype.Draw_Lines.apply(this, arguments);
     PDSL.VisitedHyperlink = false;
+    PDSL.Hyperlink = false;
 };
 //-----------------------------------------------------------------------------------
 // Работаем со значениями

word/Editor/Paragraph.js

@@ -12890,6 +12890,7 @@ function CParagraphDrawStateElements()
     this.CurPos = new CParagraphContentPos();
 
     this.VisitedHyperlink = false;
+    this.Hyperlink = false;
 
     this.Page   = 0;
     this.Line   = 0;
@@ -12914,6 +12915,7 @@ CParagraphDrawStateElements.prototype =
         this.ColorMap  = ColorMap;
 
         this.VisitedHyperlink = false;
+        this.Hyperlink = false;
 
         this.CurPos = new CParagraphContentPos();
     },
@@ -12945,6 +12947,7 @@ function CParagraphDrawStateLines()
     this.CurPos = new CParagraphContentPos();
 
     this.VisitedHyperlink = false;
+    this.Hyperlink = false;
 
     this.Strikeout  = new CParaDrawingRangeLines();
     this.DStrikeout = new CParaDrawingRangeLines();
@@ -12974,6 +12977,7 @@ CParagraphDrawStateLines.prototype =
         this.BgColor   = BgColor;
 
         this.VisitedHyperlink = false;
+        this.Hyperlink = false;
 
         this.CurPos = new CParagraphContentPos();
 

word/Editor/Run.js

@@ -4616,6 +4616,7 @@ ParaRun.prototype.Draw_Elements = function(PDSE)
     var RGBA;
     var ReviewType  = this.Get_ReviewType();
     var ReviewColor = null;
+    var bPresentation = this.Paragraph && !this.Paragraph.bFromDocument;
     if (reviewtype_Add === ReviewType || reviewtype_Remove === ReviewType)
     {
         ReviewColor = this.Get_ReviewColor();
@@ -4626,17 +4627,26 @@ ParaRun.prototype.Draw_Elements = function(PDSE)
         CurTextPr.Unifill.check(PDSE.Theme, PDSE.ColorMap);
         RGBA = CurTextPr.Unifill.getRGBAColor();
 
-        if ( true === PDSE.VisitedHyperlink && ( undefined === this.Pr.Color && undefined === this.Pr.Unifill ) )
+        if ( true === PDSE.VisitedHyperlink && ( undefined === this.Pr.Color && undefined === this.Pr.Unifill || bPresentation) )
         {
             AscFormat.G_O_VISITED_HLINK_COLOR.check(PDSE.Theme, PDSE.ColorMap);
             RGBA = AscFormat.G_O_VISITED_HLINK_COLOR.getRGBAColor();
             pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A );
         }
         else
+        {
+            if(bPresentation && PDSE.Hyperlink)
+            {
+                AscFormat.G_O_HLINK_COLOR.check(PDSE.Theme, PDSE.ColorMap);
+                RGBA = AscFormat.G_O_HLINK_COLOR.getRGBAColor();
+                pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A );
+            }
+            else
             {
                 pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A);
             }
         }
+    }
     else
     {
         if ( true === PDSE.VisitedHyperlink && ( undefined === this.Pr.Color && undefined === this.Pr.Unifill ) )