Skip to content

S
sdkjs
Commit e54731fe authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

избавился от пересчета WordArt'а при смене цветовых схем. 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63084 954022d7-b5bf-4e40-9824-e11837661b57
parent 0f23bd22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 128 deletions
Common/Drawings/Format/Shape.js
View file @ e54731fe
...@@ -3521,15 +3521,17 @@ CShape.prototype = ...@@ -3521,15 +3521,17 @@ CShape.prototype =
} }
else else
{ {
var oTheme = this.getParentObjects().theme;
var oColorMap = this.Get_ColorMap();
if(!this.bWordShape && (!this.txBody.content || this.txBody.content.Is_Empty()) && this.txBody.content2 != null && !this.addTextFlag && (this.isEmptyPlaceholder ? this.isEmptyPlaceholder() : false)) if(!this.bWordShape && (!this.txBody.content || this.txBody.content.Is_Empty()) && this.txBody.content2 != null && !this.addTextFlag && (this.isEmptyPlaceholder ? this.isEmptyPlaceholder() : false))
{ {
if(editor && editor.ShowParaMarks) if(editor && editor.ShowParaMarks)
{ {
this.txWarpStructParamarks2.draw(graphics, this.transformTextWordArt2); this.txWarpStructParamarks2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap);
} }
else else
{ {
this.txWarpStruct2.draw(graphics, this.transformTextWordArt2); this.txWarpStruct2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap);
} }
} }
else else
...@@ -3559,11 +3561,11 @@ CShape.prototype = ...@@ -3559,11 +3561,11 @@ CShape.prototype =
var oTransform = this.transformTextWordArt; var oTransform = this.transformTextWordArt;
if(editor && editor.ShowParaMarks) if(editor && editor.ShowParaMarks)
{ {
this.txWarpStructParamarks.draw(graphics, oTransform); this.txWarpStructParamarks.draw(graphics, oTransform, oTheme, oColorMap);
} }
else else
{ {
this.txWarpStruct.draw(graphics, oTransform); this.txWarpStruct.draw(graphics, oTransform, oTheme, oColorMap);
} }
if(bNeedRestoreState) if(bNeedRestoreState)
{ {
...@@ -4740,7 +4742,7 @@ CShape.prototype = ...@@ -4740,7 +4742,7 @@ CShape.prototype =
var oRet = {oTxWarpStruct: null, oTxWarpStructParamarks: null}; var oRet = {oTxWarpStruct: null, oTxWarpStructParamarks: null};
if((oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape") || this.checkContentWordArt(oContent)) if((oBodyPr.prstTxWarp && oBodyPr.prstTxWarp.preset !== "textNoShape") || this.checkContentWordArt(oContent))
{ {
var oTextDrawer = new CTextDrawer(dWidth, dHeight, true); var oTextDrawer = new CTextDrawer(dWidth, dHeight, true, this.Get_Theme());
var warpGeometry = oBodyPr.prstTxWarp; var warpGeometry = oBodyPr.prstTxWarp;
warpGeometry && warpGeometry.Recalculate(dWidth, dHeight); warpGeometry && warpGeometry.Recalculate(dWidth, dHeight);
var OldShowParaMarks; var OldShowParaMarks;
......
Common/Drawings/TextDrawer.js
View file @ e54731fe
This diff is collapsed.
Common/Drawings/TrackObjects/RotateTracks.js
View file @ e54731fe
...@@ -202,7 +202,7 @@ ObjectToDraw.prototype = ...@@ -202,7 +202,7 @@ ObjectToDraw.prototype =
this.oParaLine = oParaLine; this.oParaLine = oParaLine;
}, },
draw: function(graphics, bNoParentShapeTransform, oTransformMatrix) draw: function(graphics, bNoParentShapeTransform, oTransformMatrix, oTheme, oColorMap)
{ {
var oTransform; var oTransform;
if(oTransformMatrix) if(oTransformMatrix)
...@@ -220,6 +220,17 @@ ObjectToDraw.prototype = ...@@ -220,6 +220,17 @@ ObjectToDraw.prototype =
oTransform = this.TransformMatrix; oTransform = this.TransformMatrix;
} }
} }
if(oTheme && oColorMap)
{
if(this.brush)
{
this.brush.check(oTheme, oColorMap);
}
if(this.pen && this.pen.Fill)
{
this.pen.Fill.check(oTheme, oColorMap);
}
}
graphics.SaveGrState(); graphics.SaveGrState();
graphics.SetIntegerGrid(false); graphics.SetIntegerGrid(false);
graphics.transform3(oTransform, false); graphics.transform3(oTransform, false);
......
Word/Editor/Paragraph.js
View file @ e54731fe
...@@ -1578,7 +1578,7 @@ Paragraph.prototype = ...@@ -1578,7 +1578,7 @@ Paragraph.prototype =
// Если есть выделение текста, рисуем его сначала // Если есть выделение текста, рисуем его сначала
if ( highlight_None != NumTextPr.HighLight ) if ( highlight_None != NumTextPr.HighLight )
PDSH.High.Add( Y0, Y1, X_start, X_start + NumberingItem.WidthNum + NumberingItem.WidthSuff, 0, NumTextPr.HighLight.r, NumTextPr.HighLight.g, NumTextPr.HighLight.b ); PDSH.High.Add( Y0, Y1, X_start, X_start + NumberingItem.WidthNum + NumberingItem.WidthSuff, 0, NumTextPr.HighLight.r, NumTextPr.HighLight.g, NumTextPr.HighLight.b, undefined, NumTextPr );
} }
} }
...@@ -1703,6 +1703,10 @@ Paragraph.prototype = ...@@ -1703,6 +1703,10 @@ Paragraph.prototype =
{ {
pGraphics.b_color1( Pr.ParaPr.Shd.Color.r, Pr.ParaPr.Shd.Color.g, Pr.ParaPr.Shd.Color.b, 255 ); pGraphics.b_color1( Pr.ParaPr.Shd.Color.r, Pr.ParaPr.Shd.Color.g, Pr.ParaPr.Shd.Color.b, 255 );
} }
if(pGraphics.SetShd)
{
pGraphics.SetShd(Pr.ParaPr.Shd);
}
pGraphics.rect(TempX0, this.Pages[CurPage].Y + TempTop, TempX1 - TempX0, TempBottom - TempTop); pGraphics.rect(TempX0, this.Pages[CurPage].Y + TempTop, TempX1 - TempX0, TempBottom - TempTop);
pGraphics.df(); pGraphics.df();
...@@ -1718,14 +1722,18 @@ Paragraph.prototype = ...@@ -1718,14 +1722,18 @@ Paragraph.prototype =
if(pGraphics.Start_Command) if(pGraphics.Start_Command)
{ {
pGraphics.Start_Command(DRAW_COMMAND_LINE, this.Lines[CurLine], CurLine, 2) pGraphics.Start_Command(DRAW_COMMAND_LINE, this.Lines[CurLine], CurLine, 2);
} }
var aShd = PDSH.Shd; var aShd = PDSH.Shd;
var Element = aShd.Get_Next(); var Element = aShd.Get_Next();
while ( null != Element ) while ( null != Element )
{ {
pGraphics.b_color1( Element.r, Element.g, Element.b, 255 ); pGraphics.b_color1( Element.r, Element.g, Element.b, 255 );
pGraphics.rect( Element.x0, Element.y0, Element.x1 - Element.x0, Element.y1 - Element.y0 ); if(pGraphics.SetShd)
{
pGraphics.SetShd(Element.Additional2);
}
pGraphics.rect( Element.x0, Element.y0, Element.x1 - Element.x0, Element.y1 - Element.y0);
pGraphics.df(); pGraphics.df();
Element = aShd.Get_Next(); Element = aShd.Get_Next();
} }
...@@ -1738,7 +1746,7 @@ Paragraph.prototype = ...@@ -1738,7 +1746,7 @@ Paragraph.prototype =
while ( null != Element ) while ( null != Element )
{ {
pGraphics.b_color1( Element.r, Element.g, Element.b, 255 ); pGraphics.b_color1( Element.r, Element.g, Element.b, 255 );
pGraphics.rect( Element.x0, Element.y0, Element.x1 - Element.x0, Element.y1 - Element.y0 ); pGraphics.rect( Element.x0, Element.y0, Element.x1 - Element.x0, Element.y1 - Element.y0, Element.Additional2 );
pGraphics.df(); pGraphics.df();
Element = aHigh.Get_Next(); Element = aHigh.Get_Next();
} }
...@@ -1858,6 +1866,10 @@ Paragraph.prototype = ...@@ -1858,6 +1866,10 @@ Paragraph.prototype =
{ {
var RGBA = Pr.ParaPr.Brd.Right.Get_Color(this); var RGBA = Pr.ParaPr.Brd.Right.Get_Color(this);
pGraphics.p_color(RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color(RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Right);
}
pGraphics.drawVerLine( c_oAscLineDrawingRule.Right, TempX1 + 1 + Pr.ParaPr.Brd.Right.Size + Pr.ParaPr.Brd.Right.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Right.Size ); pGraphics.drawVerLine( c_oAscLineDrawingRule.Right, TempX1 + 1 + Pr.ParaPr.Brd.Right.Size + Pr.ParaPr.Brd.Right.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Right.Size );
} }
...@@ -1865,6 +1877,10 @@ Paragraph.prototype = ...@@ -1865,6 +1877,10 @@ Paragraph.prototype =
{ {
var RGBA = Pr.ParaPr.Brd.Left.Get_Color(this); var RGBA = Pr.ParaPr.Brd.Left.Get_Color(this);
pGraphics.p_color(RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color(RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Left);
}
pGraphics.drawVerLine( c_oAscLineDrawingRule.Left, TempX0 - 1 - Pr.ParaPr.Brd.Left.Size - Pr.ParaPr.Brd.Left.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Left.Size ); pGraphics.drawVerLine( c_oAscLineDrawingRule.Left, TempX0 - 1 - Pr.ParaPr.Brd.Left.Size - Pr.ParaPr.Brd.Left.Space, this.Pages[CurPage].Y + TempTop, this.Pages[CurPage].Y + TempBottom, Pr.ParaPr.Brd.Left.Size );
} }
} }
...@@ -2125,7 +2141,11 @@ Paragraph.prototype = ...@@ -2125,7 +2141,11 @@ Paragraph.prototype =
while ( null != Element ) while ( null != Element )
{ {
pGraphics.p_color( Element.r, Element.g, Element.b, 255 ); pGraphics.p_color( Element.r, Element.g, Element.b, 255 );
pGraphics.drawHorLine(c_oAscLineDrawingRule.Top, Element.y0, Element.x0, Element.x1, Element.w ); if(pGraphics.SetAdditionalProps)
{
pGraphics.SetAdditionalProps(Element.Additional2);
}
pGraphics.drawHorLine(c_oAscLineDrawingRule.Top, Element.y0, Element.x0, Element.x1, Element.w);
Element = aStrikeout.Get_Next(); Element = aStrikeout.Get_Next();
} }
...@@ -2134,7 +2154,12 @@ Paragraph.prototype = ...@@ -2134,7 +2154,12 @@ Paragraph.prototype =
while ( null != Element ) while ( null != Element )
{ {
pGraphics.p_color( Element.r, Element.g, Element.b, 255 ); pGraphics.p_color( Element.r, Element.g, Element.b, 255 );
pGraphics.drawHorLine2(c_oAscLineDrawingRule.Top, Element.y0, Element.x0, Element.x1, Element.w ); if(pGraphics.SetAdditionalProps)
{
pGraphics.SetAdditionalProps(Element.Additional2);
}
pGraphics.drawHorLine2(c_oAscLineDrawingRule.Top, Element.y0, Element.x0, Element.x1, Element.w);
Element = aDStrikeout.Get_Next(); Element = aDStrikeout.Get_Next();
} }
...@@ -2144,7 +2169,11 @@ Paragraph.prototype = ...@@ -2144,7 +2169,11 @@ Paragraph.prototype =
while ( null != Element ) while ( null != Element )
{ {
pGraphics.p_color( Element.r, Element.g, Element.b, 255 ); pGraphics.p_color( Element.r, Element.g, Element.b, 255 );
pGraphics.drawHorLine(0, Element.y0, Element.x0, Element.x1, Element.w ); if(pGraphics.SetAdditionalProps)
{
pGraphics.SetAdditionalProps(Element.Additional2);
}
pGraphics.drawHorLine(0, Element.y0, Element.x0, Element.x1, Element.w);
Element = aUnderline.Get_Next(); Element = aUnderline.Get_Next();
} }
...@@ -2221,6 +2250,10 @@ Paragraph.prototype = ...@@ -2221,6 +2250,10 @@ Paragraph.prototype =
RGBA = Pr.ParaPr.Brd.Top.Get_Color(this); RGBA = Pr.ParaPr.Brd.Top.Get_Color(this);
pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Top);
}
// Учтем разрывы из-за обтекания // Учтем разрывы из-за обтекания
var StartLine = this.Pages[CurPage].StartLine; var StartLine = this.Pages[CurPage].StartLine;
...@@ -2252,6 +2285,10 @@ Paragraph.prototype = ...@@ -2252,6 +2285,10 @@ Paragraph.prototype =
{ {
RGBA = Pr.ParaPr.Brd.Top.Get_Color(this); RGBA = Pr.ParaPr.Brd.Top.Get_Color(this);
pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Top);
}
Size = Pr.ParaPr.Brd.Top.Size; Size = Pr.ParaPr.Brd.Top.Size;
Y = this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top + Pr.ParaPr.Spacing.Before; Y = this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top + Pr.ParaPr.Spacing.Before;
bDraw = true; bDraw = true;
...@@ -2260,6 +2297,10 @@ Paragraph.prototype = ...@@ -2260,6 +2297,10 @@ Paragraph.prototype =
{ {
RGBA = Pr.ParaPr.Brd.Between.Get_Color(this); RGBA = Pr.ParaPr.Brd.Between.Get_Color(this);
pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Between);
}
Size = Pr.ParaPr.Brd.Between.Size; Size = Pr.ParaPr.Brd.Between.Size;
Y = this.Pages[CurPage].Y + Pr.ParaPr.Spacing.Before; Y = this.Pages[CurPage].Y + Pr.ParaPr.Spacing.Before;
bDraw = true; bDraw = true;
...@@ -2311,7 +2352,10 @@ Paragraph.prototype = ...@@ -2311,7 +2352,10 @@ Paragraph.prototype =
RGBA = Pr.ParaPr.Brd.Bottom.Get_Color(this); RGBA = Pr.ParaPr.Brd.Bottom.Get_Color(this);
pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Bottom);
}
// Учтем разрывы из-за обтекания // Учтем разрывы из-за обтекания
var EndLine = this.Pages[CurPage].EndLine; var EndLine = this.Pages[CurPage].EndLine;
var RangesCount = this.Lines[EndLine].Ranges.length; var RangesCount = this.Lines[EndLine].Ranges.length;
...@@ -2339,7 +2383,10 @@ Paragraph.prototype = ...@@ -2339,7 +2383,10 @@ Paragraph.prototype =
{ {
RGBA = Pr.ParaPr.Brd.Bottom.Get_Color(this); RGBA = Pr.ParaPr.Brd.Bottom.Get_Color(this);
pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 ); pGraphics.p_color( RGBA.r, RGBA.g, RGBA.b, 255 );
if(pGraphics.SetBorder)
{
pGraphics.SetBorder(Pr.ParaPr.Brd.Bottom);
}
// Учтем разрывы из-за обтекания // Учтем разрывы из-за обтекания
var EndLine = this.Pages[CurPage].EndLine; var EndLine = this.Pages[CurPage].EndLine;
var RangesCount = this.Lines[EndLine].Ranges.length; var RangesCount = this.Lines[EndLine].Ranges.length;
...@@ -12803,7 +12850,7 @@ function CParaPos(Range, Line, Page, Pos) ...@@ -12803,7 +12850,7 @@ function CParaPos(Range, Line, Page, Pos)
// используется в Internal_Draw_3 и Internal_Draw_5 // используется в Internal_Draw_3 и Internal_Draw_5
function CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional) function CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional, Additional2)
{ {
this.y0 = y0; this.y0 = y0;
this.y1 = y1; this.y1 = y1;
...@@ -12815,6 +12862,7 @@ function CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional) ...@@ -12815,6 +12862,7 @@ function CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional)
this.b = b; this.b = b;
this.Additional = Additional; this.Additional = Additional;
this.Additional2 = Additional2;
} }
...@@ -12830,9 +12878,9 @@ CParaDrawingRangeLines.prototype = ...@@ -12830,9 +12878,9 @@ CParaDrawingRangeLines.prototype =
this.Elements = []; this.Elements = [];
}, },
Add : function (y0, y1, x0, x1, w, r, g, b, Additional) Add : function (y0, y1, x0, x1, w, r, g, b, Additional, Additional2)
{ {
this.Elements.push( new CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional) ); this.Elements.push( new CParaDrawingRangeLinesElement(y0, y1, x0, x1, w, r, g, b, Additional, Additional2) );
}, },
Get_Next : function() Get_Next : function()
......
Word/Editor/Run.js
View file @ e54731fe
...@@ -3806,7 +3806,8 @@ ParaRun.prototype.Draw_HighLights = function(PDSH) ...@@ -3806,7 +3806,8 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
var bDrawFind = PDSH.DrawFind; var bDrawFind = PDSH.DrawFind;
var bDrawColl = PDSH.DrawColl; var bDrawColl = PDSH.DrawColl;
var oShd = this.Get_CompiledPr(false).Shd; var oCompiledPr = this.Get_CompiledPr(false);
var oShd = oCompiledPr.Shd;
var bDrawShd = ( oShd === undefined || shd_Nil === oShd.Value ? false : true ); var bDrawShd = ( oShd === undefined || shd_Nil === oShd.Value ? false : true );
var ShdColor = ( true === bDrawShd ? oShd.Get_Color( PDSH.Paragraph ) : null ); var ShdColor = ( true === bDrawShd ? oShd.Get_Color( PDSH.Paragraph ) : null );
...@@ -3821,7 +3822,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH) ...@@ -3821,7 +3822,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
var CommentId = ( CommentsCount > 0 ? PDSH.Comments[CommentsCount - 1] : null ); var CommentId = ( CommentsCount > 0 ? PDSH.Comments[CommentsCount - 1] : null );
var CommentsFlag = PDSH.CommentsFlag; var CommentsFlag = PDSH.CommentsFlag;
var HighLight = this.Get_CompiledPr(false).HighLight; var HighLight = oCompiledPr.HighLight;
var SearchMarksCount = this.SearchMarks.length; var SearchMarksCount = this.SearchMarks.length;
...@@ -3850,7 +3851,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH) ...@@ -3850,7 +3851,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
var DrawColl = this.CollaborativeMarks.Check( Pos ); var DrawColl = this.CollaborativeMarks.Check( Pos );
if ( true === bDrawShd ) if ( true === bDrawShd )
aShd.Add( Y0, Y1, X, X + ItemWidthVisible, 0, ShdColor.r, ShdColor.g, ShdColor.b ); aShd.Add( Y0, Y1, X, X + ItemWidthVisible, 0, ShdColor.r, ShdColor.g, ShdColor.b, undefined, oShd );
switch( ItemType ) switch( ItemType )
{ {
...@@ -3870,7 +3871,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH) ...@@ -3870,7 +3871,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
if ( CommentsFlag != comments_NoComment ) if ( CommentsFlag != comments_NoComment )
aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } ); aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
else if ( highlight_None != HighLight ) else if ( highlight_None != HighLight )
aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b ); aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b, undefined, HighLight );
if ( true === DrawSearch ) if ( true === DrawSearch )
aFind.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0 ); aFind.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0 );
...@@ -3890,7 +3891,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH) ...@@ -3890,7 +3891,7 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
if ( CommentsFlag != comments_NoComment ) if ( CommentsFlag != comments_NoComment )
aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } ); aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
else if ( highlight_None != HighLight ) else if ( highlight_None != HighLight )
aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b ); aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b, undefined, HighLight );
PDSH.Spaces--; PDSH.Spaces--;
} }
...@@ -4291,14 +4292,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL) ...@@ -4291,14 +4292,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
if (true === bRemReview) if (true === bRemReview)
aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, 255, 0, 0); aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, 255, 0, 0);
else if (true === CurTextPr.DStrikeout) else if (true === CurTextPr.DStrikeout)
aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
else if ( true === CurTextPr.Strikeout ) else if ( true === CurTextPr.Strikeout )
aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
if (true === bAddReview) if (true === bAddReview)
aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 255, 0, 0); aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 255, 0, 0);
else if (true === CurTextPr.Underline) else if (true === CurTextPr.Underline)
aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b); aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
if ( PDSL.SpellingCounter > 0 ) if ( PDSL.SpellingCounter > 0 )
aSpelling.Add( UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 0, 0, 0 ); aSpelling.Add( UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 0, 0, 0 );
...@@ -4316,14 +4317,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL) ...@@ -4316,14 +4317,14 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
if (true === bRemReview) if (true === bRemReview)
aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, 255, 0, 0); aStrikeout.Add(StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, 255, 0, 0);
else if (true === CurTextPr.DStrikeout) else if (true === CurTextPr.DStrikeout)
aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
else if ( true === CurTextPr.Strikeout ) else if ( true === CurTextPr.Strikeout )
aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
if (true === bAddReview) if (true === bAddReview)
aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 255, 0, 0); aUnderline.Add(UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, 255, 0, 0);
else if (true === CurTextPr.Underline) else if (true === CurTextPr.Underline)
aUnderline.Add( UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aUnderline.Add( UnderlineY, UnderlineY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
PDSL.Spaces--; PDSL.Spaces--;
} }
...@@ -4337,9 +4338,9 @@ ParaRun.prototype.Draw_Lines = function(PDSL) ...@@ -4337,9 +4338,9 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
case para_Math_Ampersand: case para_Math_Ampersand:
{ {
if ( true === CurTextPr.DStrikeout ) if ( true === CurTextPr.DStrikeout )
aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
else if ( true === CurTextPr.Strikeout ) else if ( true === CurTextPr.Strikeout )
aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
X += ItemWidthVisible; X += ItemWidthVisible;
...@@ -4349,9 +4350,9 @@ ParaRun.prototype.Draw_Lines = function(PDSL) ...@@ -4349,9 +4350,9 @@ ParaRun.prototype.Draw_Lines = function(PDSL)
{ {
var ctrPrp = this.Parent.GetCtrPrp(); var ctrPrp = this.Parent.GetCtrPrp();
if(true === ctrPrp.DStrikeout) if(true === ctrPrp.DStrikeout)
aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aDStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
else if(true === ctrPrp.Strikeout) else if(true === ctrPrp.Strikeout)
aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b ); aStrikeout.Add( StrikeoutY, StrikeoutY, X, X + ItemWidthVisible, LineW, CurColor.r, CurColor.g, CurColor.b, undefined, CurTextPr );
X += ItemWidthVisible; X += ItemWidthVisible;
break; break;
......
Word/Editor/Table.js
View file @ e54731fe
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7