Commit 777a8b94 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #34644

parent 7f757e24
...@@ -3136,11 +3136,6 @@ ParaRun.prototype.Recalculate_Range = function(PRS, ParaPr, Depth) ...@@ -3136,11 +3136,6 @@ ParaRun.prototype.Recalculate_Range = function(PRS, ParaPr, Depth)
if (break_Page === Item.BreakType) if (break_Page === Item.BreakType)
PRS.BreakRealPageLine = true; PRS.BreakRealPageLine = true;
if (break_Page === Item.BreakType && true === Para.Check_BreakPageEnd(Item))
continue;
Item.Flags.NewLine = true;
// PageBreak вне самого верхнего документа не надо учитывать // PageBreak вне самого верхнего документа не надо учитывать
if (!(Para.Parent instanceof CDocument) || true !== Para.Is_Inline()) if (!(Para.Parent instanceof CDocument) || true !== Para.Is_Inline())
{ {
...@@ -3151,6 +3146,11 @@ ParaRun.prototype.Recalculate_Range = function(PRS, ParaPr, Depth) ...@@ -3151,6 +3146,11 @@ ParaRun.prototype.Recalculate_Range = function(PRS, ParaPr, Depth)
continue; continue;
} }
if (break_Page === Item.BreakType && true === Para.Check_BreakPageEnd(Item))
continue;
Item.Flags.NewLine = true;
NewPage = true; NewPage = true;
NewRange = true; NewRange = true;
} }
...@@ -3868,7 +3868,7 @@ ParaRun.prototype.Recalculate_Range_Spaces = function(PRSA, _CurLine, _CurRange, ...@@ -3868,7 +3868,7 @@ ParaRun.prototype.Recalculate_Range_Spaces = function(PRSA, _CurLine, _CurRange,
case para_NewLine: case para_NewLine:
{ {
if (break_Page === Item.BreakType || break_Column === Item.BreakType) if (break_Page === Item.BreakType || break_Column === Item.BreakType)
Item.Update_String( PRSA.XEnd - PRSA.X ); Item.Update_String(PRSA.XEnd - PRSA.X);
PRSA.X += Item.WidthVisible; PRSA.X += Item.WidthVisible;
......
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