Commit fc0e3097 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed issue with a column break inside a table. Fixed issue in algorithm of...

Fixed issue with a column break inside a table. Fixed issue in algorithm of recalculate bottom line of section with several columns.
parent c5b86b28
......@@ -2279,8 +2279,8 @@ CDocument.prototype.Recalculate_PageColumn = function()
var StartIndex = this.FullRecalc.StartIndex;
var bResetStartElement = this.FullRecalc.ResetStartElement;
// console.log("Page " + PageIndex + " Section " + SectionIndex + " Column " + ColumnIndex + " Element " + StartIndex);
// console.log(this.RecalcInfo);
// console.log("Page " + PageIndex + " Section " + SectionIndex + " Column " + ColumnIndex + " Element " + StartIndex);
// console.log(this.RecalcInfo);
var StartPos = this.Get_PageContentStartPos2(PageIndex, ColumnIndex, 0, StartIndex);
......@@ -2430,7 +2430,7 @@ CDocument.prototype.Recalculate_PageColumn = function()
Element.TurnOn_RecalcEvent();
if (true != bFlow && RecalcResult & recalcresult_NextElement)
if (true != bFlow && (RecalcResult & recalcresult_NextElement || RecalcResult & recalcresult_NextPage))
{
var ElementPageIndex = this.private_GetElementPageIndex(Index, PageIndex, ColumnIndex, ColumnsCount);
Y = Element.Get_PageBounds(ElementPageIndex).Bottom;
......@@ -2522,8 +2522,7 @@ CDocument.prototype.Recalculate_PageColumn = function()
var NewPageSection = new CDocumentPageSection();
NewPageSection.Pos = Index;
NewPageSection.EndPos = Index;
NewPageSection.Y = SectionY + 0.001; // bug fix 32748 проверить здесь
//NewPageSection.Y = true === PageSection.Is_CalculatingSectionBottomLine() ? PageSection.CurrentY : SectionY + 0.001;
NewPageSection.Y = SectionY + 0.001;
NewPageSection.YLimit = true === PageSection.Is_CalculatingSectionBottomLine() ? PageSection.YLimit2 : RealYLimit;
Page.Sections[_SectionIndex] = NewPageSection;
......
......@@ -2110,7 +2110,8 @@ Paragraph.prototype.private_CheckColumnBreak = function(CurPage)
if (Line.Info & paralineinfo_BreakPage && !(Line.Info & paralineinfo_BreakRealPage))
{
this.Parent.OnColumnBreak_WhileRecalculate();
if (this.LogicDocument)
this.LogicDocument.OnColumnBreak_WhileRecalculate();
}
};
......
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