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

Исправлен баг с рассчетом высоты параграфа (баг 19749).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49668 954022d7-b5bf-4e40-9824-e11837661b57
parent 217b504e
...@@ -173,7 +173,7 @@ Paragraph.prototype = ...@@ -173,7 +173,7 @@ Paragraph.prototype =
{ {
var Pr_old = this.Pr; var Pr_old = this.Pr;
var Pr_new = oNewPr; var Pr_new = oNewPr;
History.Add( Para, { Type : historyitem_Paragraph_Pr, Old : Pr_old, New : Pr_new } ); History.Add( this, { Type : historyitem_Paragraph_Pr, Old : Pr_old, New : Pr_new } );
this.Pr = oNewPr; this.Pr = oNewPr;
}, },
...@@ -2068,7 +2068,7 @@ Paragraph.prototype = ...@@ -2068,7 +2068,7 @@ Paragraph.prototype =
// убирается в промежутках. // убирается в промежутках.
var TempDy = this.Lines[this.Pages[CurPage].FirstLine].Metrics.Ascent; var TempDy = this.Lines[this.Pages[CurPage].FirstLine].Metrics.Ascent;
if ( 0 === this.Pages[CurPage].FirstLine && ( 0 === CurPage || true === this.Parent.Is_TableCellContent() ) ) if ( 0 === this.Pages[CurPage].FirstLine && ( 0 === CurPage || true === this.Parent.Is_TableCellContent() || true === ParaPr.PageBreakBefore ) )
TempDy += ParaPr.Spacing.Before; TempDy += ParaPr.Spacing.Before;
if ( 0 === this.Pages[CurPage].FirstLine ) if ( 0 === this.Pages[CurPage].FirstLine )
...@@ -2235,7 +2235,7 @@ Paragraph.prototype = ...@@ -2235,7 +2235,7 @@ Paragraph.prototype =
Top = Y; Top = Y;
Top2 = Y; Top2 = Y;
if ( 0 === CurPage || true === this.Parent.Is_TableCellContent() ) if ( 0 === CurPage || true === this.Parent.Is_TableCellContent() || true === ParaPr.PageBreakBefore )
{ {
Top2 = Top + ParaPr.Spacing.Before; Top2 = Top + ParaPr.Spacing.Before;
Bottom = Top + ParaPr.Spacing.Before + this.Lines[0].Metrics.Ascent + this.Lines[0].Metrics.Descent + this.Lines[0].Metrics.LineGap; Bottom = Top + ParaPr.Spacing.Before + this.Lines[0].Metrics.Ascent + this.Lines[0].Metrics.Descent + this.Lines[0].Metrics.LineGap;
...@@ -2773,7 +2773,7 @@ Paragraph.prototype = ...@@ -2773,7 +2773,7 @@ Paragraph.prototype =
var EndLine = this.Lines.length - 1; var EndLine = this.Lines.length - 1;
var TempDy = this.Lines[this.Pages[CurPage].FirstLine].Metrics.Ascent; var TempDy = this.Lines[this.Pages[CurPage].FirstLine].Metrics.Ascent;
if ( 0 === StartLine && ( 0 === CurPage || true === this.Parent.Is_TableCellContent() ) ) if ( 0 === StartLine && ( 0 === CurPage || true === this.Parent.Is_TableCellContent() || true === ParaPr.PageBreakBefore ) )
TempDy += ParaPr.Spacing.Before; TempDy += ParaPr.Spacing.Before;
if ( 0 === StartLine ) if ( 0 === StartLine )
......
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