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

Исправлен баг с зависанием рассчета формул. Предыдущая правка отменена.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64377 954022d7-b5bf-4e40-9824-e11837661b57
parent e4079cdd
......@@ -1506,7 +1506,6 @@ ParaMath.prototype.CompareMathInfo = function(RecalculateObject)
};
ParaMath.prototype.Recalculate_Reset = function(CurRange, CurLine, RecalcResult)
{
if(RecalcResult !== recalcresult_PrevLine)
this.Root.Recalculate_Reset(CurRange, CurLine); // обновим StartLine и StartRange только для Root (в CParagraphContentWithContentBase), для внутренних элементов обновится на Recalculate_Range
};
ParaMath.prototype.Recalculate_Set_RangeEndPos = function(PRS, PRP, Depth)
......
......@@ -894,6 +894,9 @@ Paragraph.prototype.private_RecalculateLineRanges = function(CurLine, CurPa
if (recalcresult_NextPage === PRS.RecalcResult)
return false;
if (recalcresult_PrevLine === PRS.RecalcResult || recalcresult_CurPagePara === PRS.RecalcResult)
return true;
CurRange++;
}
......@@ -1668,7 +1671,7 @@ Paragraph.prototype.private_RecalculateRange = function(CurRange, CurL
if ( ( 0 === Pos && 0 === CurLine && 0 === CurRange ) || Pos !== StartPos )
{
Item.Recalculate_Reset( CurRange, CurLine, PRS.RecalcResult);
Item.Recalculate_Reset(CurRange, CurLine);
}
PRS.Update_CurPos( Pos, 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