Commit a3e58879 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@62214 954022d7-b5bf-4e40-9824-e11837661b57
parent 7529d1bf
This diff is collapsed.
...@@ -12042,10 +12042,7 @@ CDocument.prototype = ...@@ -12042,10 +12042,7 @@ CDocument.prototype =
var oSelectedInfo = this.Get_SelectedElementsInfo(); var oSelectedInfo = this.Get_SelectedElementsInfo();
var Math = oSelectedInfo.Get_Math(); var Math = oSelectedInfo.Get_Math();
if (null !== Math) if (null !== Math)
{ this.DrawingDocument.Update_MathTrack(true, (false === bSelection || true === bEmptySelection ? true : false), Math);
var Bounds = Math.Get_Bounds();
this.DrawingDocument.Update_MathTrack(true, (false === bSelection || true === bEmptySelection ? true : false), Math, Bounds.X, Bounds.Y, Bounds.W, Bounds.H, Bounds.Page);
}
else else
this.DrawingDocument.Update_MathTrack(false); this.DrawingDocument.Update_MathTrack(false);
......
...@@ -1824,10 +1824,7 @@ ParaMath.prototype.Get_ContentSelection = function() ...@@ -1824,10 +1824,7 @@ ParaMath.prototype.Get_ContentSelection = function()
return null; return null;
var Bounds = oContent.Get_Bounds(); var Bounds = oContent.Get_Bounds();
return Bounds;
var LinesCount = oContent.protected_GetLinesCount();
return Bounds[0];
}; };
ParaMath.prototype.Recalc_RunsCompiledPr = function() ParaMath.prototype.Recalc_RunsCompiledPr = function()
...@@ -1969,14 +1966,9 @@ ParaMath.prototype.Make_AutoCorrect = function() ...@@ -1969,14 +1966,9 @@ ParaMath.prototype.Make_AutoCorrect = function()
ParaMath.prototype.Get_Bounds = function() ParaMath.prototype.Get_Bounds = function()
{ {
if (undefined === this.Paragraph || null === this.Paragraph) if (undefined === this.Paragraph || null === this.Paragraph)
return {X : 0, Y : 0, W : 0, H : 0, Page : 0}; return [{X : 0, Y : 0, W : 0, H : 0, Page : 0}];
else else
{ return this.Root.Get_Bounds();
var LinesCount = this.Root.protected_GetLinesCount();
return this.Root.Get_Bounds()[LinesCount - 1];
}
}; };
ParaMath.prototype.getPropsForWrite = function() ParaMath.prototype.getPropsForWrite = function()
......
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