Bug #31511 Исправлен баг с рассчетом разрыва колонки.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68925 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Document.js

@@ -2034,7 +2034,7 @@ CDocument.prototype =
                 if (null !== PrevElement && type_Paragraph === PrevElement.Get_Type() && true === PrevElement.Is_Empty() && undefined !== PrevElement.Get_SectionPr())
                     PrevElement = PrevElement.Get_DocumentPrev();
 
-                if (null !== PrevElement && type_Paragraph === PrevElement.Get_Type() && Index !== Page.Pos)
+                if (null !== PrevElement && type_Paragraph === PrevElement.Get_Type())
                 {
                     var bNeedPageBreak = true;
                     if (undefined !== PrevElement.Get_SectionPr())
@@ -2046,10 +2046,10 @@ CDocument.prototype =
                     }
 
                     var EndLine = PrevElement.Pages[PrevElement.Pages.length - 1].EndLine;
-                    if (true === bNeedPageBreak && -1 !== EndLine && PrevElement.Lines[EndLine].Info & paralineinfo_BreakRealPage)
+                    if (true === bNeedPageBreak && -1 !== EndLine && PrevElement.Lines[EndLine].Info & paralineinfo_BreakRealPage && Index !== Page.Pos)
                         isPageBreakOnPrevLine = true;
 
-                    if (-1 !== EndLine && !(PrevElement.Lines[EndLine].Info & paralineinfo_BreakRealPage) && PrevElement.Lines[EndLine].Info & paralineinfo_BreakPage)
+                    if (-1 !== EndLine && !(PrevElement.Lines[EndLine].Info & paralineinfo_BreakRealPage) && PrevElement.Lines[EndLine].Info & paralineinfo_BreakPage && Index !== PageColumn.Pos)
                         isColumnBreakOnPrevLine = true;
                 }
 

Word/Editor/Run.js

@@ -2921,7 +2921,7 @@ ParaRun.prototype.Recalculate_Range = function(PRS, ParaPr, Depth)
                         if (break_Page === Item.BreakType)
                             PRS.BreakRealPageLine = true;
 
-                        if (true === Para.Check_BreakPageEnd(Item))
+                        if (break_Page === Item.BreakType && true === Para.Check_BreakPageEnd(Item))
                             continue;
 
                         Item.Flags.NewLine = true;