Commit 7417bd66 authored by Ilya Kirillov's avatar Ilya Kirillov

Bug #32120 Исправлен баг с повторным пересчетом длинной Flow-таблицы, разбитой...

Bug #32120 Исправлен баг с повторным пересчетом длинной Flow-таблицы, разбитой больше чем на 3 страницы.
parent 8c8dbc89
...@@ -2516,12 +2516,21 @@ CDocument.prototype = ...@@ -2516,12 +2516,21 @@ CDocument.prototype =
YLimit = 10000; YLimit = 10000;
if (true === this.RecalcInfo.Can_RecalcObject()) if (true === this.RecalcInfo.Can_RecalcObject())
{
var ElementPageIndex = 0;
if ((0 === Index && 0 === PageIndex) || Index != StartIndex || (Index === StartIndex && true === bResetStartElement))
{ {
Element.Set_DocumentIndex(Index); Element.Set_DocumentIndex(Index);
Element.Reset(X, Y, XLimit, YLimit, PageIndex, ColumnIndex, ColumnsCount); Element.Reset(X, Y, XLimit, YLimit, PageIndex, ColumnIndex, ColumnsCount);
ElementPageIndex = 0;
}
else
{
ElementPageIndex = PageIndex - Element.PageNum;
}
var TempRecalcResult = Element.Recalculate_Page(0); var TempRecalcResult = Element.Recalculate_Page(ElementPageIndex);
this.RecalcInfo.Set_FlowObject(Element, 0, TempRecalcResult, -1, {X : X, Y : Y, XLimit: XLimit, YLimit : YLimit}); this.RecalcInfo.Set_FlowObject(Element, ElementPageIndex, TempRecalcResult, -1, {X : X, Y : Y, XLimit: XLimit, YLimit : YLimit});
if (((0 === Index && 0 === PageIndex) || Index != StartIndex) && true != Element.Is_ContentOnFirstPage() && true !== isColumns) if (((0 === Index && 0 === PageIndex) || Index != StartIndex) && true != Element.Is_ContentOnFirstPage() && true !== isColumns)
{ {
......
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