Fixed bug #33702 Implemented drawing a line between columns.

word/Editor/Document.js

@@ -527,6 +527,7 @@ function CDocumentPageSection()
     this.YLimit2 = 0;
 
     this.Columns = [];
+    this.ColumnsSep = false;
 
     this.IterationsCount          = 0;
     this.CurrentY                 = 0;
@@ -670,6 +671,10 @@ CDocumentPageColumn.prototype.Reset = function()
     this.XLimit = 0;
     this.YLimit = 0;
 };
+CDocumentPageColumn.prototype.IsEmpty = function()
+{
+	return this.Empty;
+};
 
 function CDocumentPage()
 {
@@ -2184,6 +2189,7 @@ CDocument.prototype.Recalculate_Page = function()
             {
                 Page.Sections[0].Columns[ColumnIndex] = new CDocumentPageColumn();
             }
+            Page.Sections[0].ColumnsSep = SectPr.Get_ColumnsSep();
         }
 
         var Count = this.Content.length;
@@ -2545,6 +2551,7 @@ CDocument.prototype.Recalculate_PageColumn                   = function()
                             NewPageSection.EndPos        = Index;
                             NewPageSection.Y             = SectionY + 0.001;
                             NewPageSection.YLimit        = true === PageSection.Is_CalculatingSectionBottomLine() ? PageSection.YLimit2 : RealYLimit;
+                            NewPageSection.ColumnsSep    = NextSectInfo.SectPr.Get_ColumnsSep();
                             Page.Sections[_SectionIndex] = NewPageSection;
 
                             var ColumnsCount = NextSectInfo.SectPr.Get_ColumnsCount();
@@ -3620,6 +3627,14 @@ CDocument.prototype.Draw                                     = function(nPageInd
             var ColumnStartPos = Column.Pos;
             var ColumnEndPos   = Column.EndPos;
 
+            if (true === PageSection.ColumnsSep && ColumnIndex > 0 && !Column.IsEmpty())
+			{
+
+				var SepX = (Column.X + PageSection.Columns[ColumnIndex - 1].XLimit) / 2;
+				pGraphics.p_color(0, 0, 0, 255);
+				pGraphics.drawVerLine(c_oAscLineDrawingRule.Left, SepX, PageSection.Y, PageSection.YLimit, 0.75 * g_dKoef_pt_to_mm);
+			}
+
             // Плавающие объекты не должны попадать в клип колонок
             var FlowElements = [];
 

word/Editor/Sections.js

@@ -665,6 +665,11 @@ CSectionPr.prototype =
         return this.Columns.Get_ColumnSpace(ColIndex);
     },
 
+	Get_ColumnsSep : function()
+	{
+		return this.Columns.Sep;
+	},
+
 	Set_Columns_EqualWidth : function(Equal)
 	{
 		if (Equal !== this.Columns.Equal)
@@ -1202,7 +1207,7 @@ function CSectionColumns(SectPr)
 	this.SectPr     = SectPr;
 	this.EqualWidth = true;
 	this.Num        = 1;
-	this.Sep        = false;
+	this.Sep        = true;
 	this.Space      = 30;
 
 	this.Cols = [];