Commit 972a0dc7 authored by Oleg Korshul's avatar Oleg Korshul

.

parent ab5ae9a2
...@@ -2218,6 +2218,7 @@ function CDrawingDocument() ...@@ -2218,6 +2218,7 @@ function CDrawingDocument()
hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_TABLE; hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_TABLE;
hor_ruler.m_oTableMarkup = markup.CreateDublicate(); hor_ruler.m_oTableMarkup = markup.CreateDublicate();
hor_ruler.m_oColumnMarkup = null;
hor_ruler.CalculateMargins(); hor_ruler.CalculateMargins();
ver_ruler.CurrentObjectType = RULER_OBJECT_TYPE_TABLE; ver_ruler.CurrentObjectType = RULER_OBJECT_TYPE_TABLE;
...@@ -2272,6 +2273,7 @@ function CDrawingDocument() ...@@ -2272,6 +2273,7 @@ function CDrawingDocument()
hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH; hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH;
hor_ruler.m_oTableMarkup = null; hor_ruler.m_oTableMarkup = null;
hor_ruler.m_oColumnMarkup = null;
ver_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH; ver_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH;
ver_ruler.m_oTableMarkup = null; ver_ruler.m_oTableMarkup = null;
...@@ -2302,6 +2304,7 @@ function CDrawingDocument() ...@@ -2302,6 +2304,7 @@ function CDrawingDocument()
hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH; hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH;
hor_ruler.m_oTableMarkup = null; hor_ruler.m_oTableMarkup = null;
hor_ruler.m_oColumnMarkup = null;
ver_ruler.CurrentObjectType = (true === bHeader) ? RULER_OBJECT_TYPE_HEADER : RULER_OBJECT_TYPE_FOOTER; ver_ruler.CurrentObjectType = (true === bHeader) ? RULER_OBJECT_TYPE_HEADER : RULER_OBJECT_TYPE_FOOTER;
ver_ruler.header_top = Y0; ver_ruler.header_top = Y0;
...@@ -2320,6 +2323,33 @@ function CDrawingDocument() ...@@ -2320,6 +2323,33 @@ function CDrawingDocument()
this.m_oWordControl.UpdateVerRuler(); this.m_oWordControl.UpdateVerRuler();
} }
this.Set_RulerState_Columns = function (markup)
{
var hor_ruler = this.m_oWordControl.m_oHorRuler;
var ver_ruler = this.m_oWordControl.m_oVerRuler;
hor_ruler.CurrentObjectType = RULER_OBJECT_TYPE_COLUMNS;
hor_ruler.m_oTableMarkup = null;
hor_ruler.m_oColumnMarkup = markup.CreateDuplicate();
ver_ruler.CurrentObjectType = RULER_OBJECT_TYPE_PARAGRAPH;
ver_ruler.m_oTableMarkup = null;
this.TableOutlineDr.TableMatrix = null;
this.TableOutlineDr.CurrentPageIndex = this.m_lCurrentPage;
hor_ruler.CalculateMargins();
if (0 <= this.m_lCurrentPage && this.m_lCurrentPage < this.m_lPagesCount)
{
this.m_oWordControl.CreateBackgroundHorRuler();
this.m_oWordControl.CreateBackgroundVerRuler();
}
this.m_oWordControl.UpdateHorRuler();
this.m_oWordControl.UpdateVerRuler();
};
this.Update_ParaTab = function(Default_Tab, ParaTabs) this.Update_ParaTab = function(Default_Tab, ParaTabs)
{ {
var hor_ruler = this.m_oWordControl.m_oHorRuler; var hor_ruler = this.m_oWordControl.m_oHorRuler;
......
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