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

Исправлен баг с рисованием верхней и боковых границ (баг 24061).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55963 954022d7-b5bf-4e40-9824-e11837661b57
parent 67d21644
...@@ -6369,7 +6369,7 @@ Paragraph.prototype = ...@@ -6369,7 +6369,7 @@ Paragraph.prototype =
{ {
if ( Pr.ParaPr.Brd.Top.Value === border_Single || shd_Clear === Pr.ParaPr.Shd.Value ) if ( Pr.ParaPr.Brd.Top.Value === border_Single || shd_Clear === Pr.ParaPr.Shd.Value )
{ {
if ( ( true === Pr.ParaPr.Brd.First && ( false === this.Is_StartFromNewPage() || null === this.Get_DocumentPrev() || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) ) || if ( ( true === Pr.ParaPr.Brd.First && ( 0 === CurPage || true === this.Parent.Is_TableCellContent() || true === Pr.ParaPr.PageBreakBefore ) ) ||
( true !== Pr.ParaPr.Brd.First && ( ( 0 === CurPage && null === this.Get_DocumentPrev() ) || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) ) ) ( true !== Pr.ParaPr.Brd.First && ( ( 0 === CurPage && null === this.Get_DocumentPrev() ) || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) ) )
TempTop += Pr.ParaPr.Spacing.Before; TempTop += Pr.ParaPr.Spacing.Before;
} }
...@@ -6704,7 +6704,7 @@ Paragraph.prototype = ...@@ -6704,7 +6704,7 @@ Paragraph.prototype =
if ( true === Pr.ParaPr.Brd.First && border_Single === Pr.ParaPr.Brd.Top.Value && ( ( 0 === CurPage && ( false === this.Is_StartFromNewPage() || null === this.Get_DocumentPrev() ) ) || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) ) if ( true === Pr.ParaPr.Brd.First && border_Single === Pr.ParaPr.Brd.Top.Value && ( ( 0 === CurPage && ( false === this.Is_StartFromNewPage() || null === this.Get_DocumentPrev() ) ) || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) )
{ {
var Y_top = this.Pages[CurPage].Y; var Y_top = this.Pages[CurPage].Y;
if ( 0 === CurPage || ( 1 === CurPage && true === this.Is_StartFromNewPage() ) ) if ( 0 === CurPage || true === this.Parent.Is_TableCellContent() || true === Pr.ParaPr.PageBreakBefore )
Y_top += Pr.ParaPr.Spacing.Before; Y_top += Pr.ParaPr.Spacing.Before;
RGBA = Pr.ParaPr.Brd.Top.Get_Color(this); RGBA = Pr.ParaPr.Brd.Top.Get_Color(this);
......
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