Commit c973dc71 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с рисованием границ у параграфа (баг 19338).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48269 954022d7-b5bf-4e40-9824-e11837661b57
parent 40a5afa3
...@@ -4774,6 +4774,7 @@ Paragraph.prototype = ...@@ -4774,6 +4774,7 @@ Paragraph.prototype =
} }
else if ( false === Pr.ParaPr.Brd.First ) else if ( false === Pr.ParaPr.Brd.First )
{ {
var bDraw = true;
var Size = 0; var Size = 0;
var Y = 0; var Y = 0;
if ( 1 === CurPage && true === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Top.Value ) if ( 1 === CurPage && true === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Top.Value )
...@@ -4781,14 +4782,18 @@ Paragraph.prototype = ...@@ -4781,14 +4782,18 @@ Paragraph.prototype =
pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Top.Color.r, Pr.ParaPr.Brd.Top.Color.g, Pr.ParaPr.Brd.Top.Color.b, 255 );
Size = Pr.ParaPr.Brd.Top.Size; Size = Pr.ParaPr.Brd.Top.Size;
Y = this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top; Y = this.Pages[CurPage].Y + this.Lines[this.Pages[CurPage].FirstLine].Top;
bDraw = true;
} }
else if ( 0 === CurPage && false === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Between.Value ) else if ( 0 === CurPage && false === this.Is_StartFromNewPage() && border_Single === Pr.ParaPr.Brd.Between.Value )
{ {
pGraphics.p_color( Pr.ParaPr.Brd.Between.Color.r, Pr.ParaPr.Brd.Between.Color.g, Pr.ParaPr.Brd.Between.Color.b, 255 ); pGraphics.p_color( Pr.ParaPr.Brd.Between.Color.r, Pr.ParaPr.Brd.Between.Color.g, Pr.ParaPr.Brd.Between.Color.b, 255 );
Size = Pr.ParaPr.Brd.Between.Size; Size = Pr.ParaPr.Brd.Between.Size;
Y = this.Pages[CurPage].Y; Y = this.Pages[CurPage].Y;
bDraw = true;
} }
if ( true === bDraw )
{
// Учтем разрывы из-за обтекания // Учтем разрывы из-за обтекания
var StartLine = this.Pages[CurPage].StartLine; var StartLine = this.Pages[CurPage].StartLine;
var RangesCount = this.Lines[StartLine].Ranges.length; var RangesCount = this.Lines[StartLine].Ranges.length;
...@@ -4801,6 +4806,7 @@ Paragraph.prototype = ...@@ -4801,6 +4806,7 @@ Paragraph.prototype =
pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, Y, X0, X1, Size, LeftMW, RightMW ); pGraphics.drawHorLineExt( c_oAscLineDrawingRule.Top, Y, X0, X1, Size, LeftMW, RightMW );
} }
} }
}
var CurLine = this.Pages[CurPage].EndLine; var CurLine = this.Pages[CurPage].EndLine;
var bEnd = ( this.Content.length - 2 <= this.Lines[CurLine].EndPos ? true : false ); var bEnd = ( this.Content.length - 2 <= this.Lines[CurLine].EndPos ? true : false );
......
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