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

Исправлен баг с зацикливанием при пересчете. (баги 27240, 27241)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59320 954022d7-b5bf-4e40-9824-e11837661b57
parent 22b0fac9
......@@ -671,9 +671,9 @@ Paragraph.prototype.private_RecalculatePageBreak = function(CurLine, CurPa
}
// Эта проверка на случай, если предыдущий параграф закончился PageBreak
if (PRS.YStart > PRS.YLimit - 0.001)
if (PRS.YStart > PRS.YLimit - 0.001 && (CurLine != this.Pages[CurPage].FirstLine || (0 === CurPage && (null != this.Get_DocumentPrev() || true === this.Parent.Is_TableCellContent()))) && true === this.Use_YLimit())
{
this.Pages[CurPage].Set_EndLine( CurLine - 1 );
this.Pages[CurPage].Set_EndLine(CurLine - 1);
if ( 0 === CurLine )
this.Lines[-1] = new CParaLine( 0 );
......
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