Commit aa50dce3 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Повысил безопасность заливки 59722.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59732 954022d7-b5bf-4e40-9824-e11837661b57
parent 7068d054
...@@ -133,11 +133,11 @@ CMathBase.prototype = ...@@ -133,11 +133,11 @@ CMathBase.prototype =
{ {
CompiledCtrPrp = this.Get_CompiledCtrPrp_2(); CompiledCtrPrp = this.Get_CompiledCtrPrp_2();
if(bAllowInline !== false) if(bAllowInline !== false && this.ParaMath)
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value); CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value);
} }
if(bAllowInline !== false) if(bAllowInline !== false && this.ParaMath)
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.ArgSize.value);// для настроек inline формул CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.ArgSize.value);// для настроек inline формул
return CompiledCtrPrp; return CompiledCtrPrp;
......
...@@ -3294,7 +3294,7 @@ CMathContent.prototype.GetSelectContent = function() ...@@ -3294,7 +3294,7 @@ CMathContent.prototype.GetSelectContent = function()
}; };
CMathContent.prototype.Get_LeftPos = function(SearchPos, ContentPos, Depth, UseContentPos) CMathContent.prototype.Get_LeftPos = function(SearchPos, ContentPos, Depth, UseContentPos)
{ {
if (!this.bRoot && true !== this.ParentElement.Is_ContentUse(this)) if (true !== this.ParentElement.Is_ContentUse(this))
return false; return false;
if (false === UseContentPos && para_Math_Run === this.Content[this.Content.length - 1].Type) if (false === UseContentPos && para_Math_Run === this.Content[this.Content.length - 1].Type)
...@@ -3356,7 +3356,7 @@ CMathContent.prototype.Get_LeftPos = function(SearchPos, ContentPos, Depth, UseC ...@@ -3356,7 +3356,7 @@ CMathContent.prototype.Get_LeftPos = function(SearchPos, ContentPos, Depth, UseC
}; };
CMathContent.prototype.Get_RightPos = function(SearchPos, ContentPos, Depth, UseContentPos, StepEnd) CMathContent.prototype.Get_RightPos = function(SearchPos, ContentPos, Depth, UseContentPos, StepEnd)
{ {
if (!this.bRoot && true !== this.ParentElement.Is_ContentUse(this)) if (true !== this.ParentElement.Is_ContentUse(this))
return false; return false;
if (false === UseContentPos && para_Math_Run === this.Content[0].Type) if (false === UseContentPos && para_Math_Run === this.Content[0].Type)
...@@ -3418,7 +3418,7 @@ CMathContent.prototype.Get_RightPos = function(SearchPos, ContentPos, Depth, Use ...@@ -3418,7 +3418,7 @@ CMathContent.prototype.Get_RightPos = function(SearchPos, ContentPos, Depth, Use
}; };
CMathContent.prototype.Get_WordStartPos = function(SearchPos, ContentPos, Depth, UseContentPos) CMathContent.prototype.Get_WordStartPos = function(SearchPos, ContentPos, Depth, UseContentPos)
{ {
if (!this.bRoot && true !== this.ParentElement.Is_ContentUse(this)) if (true !== this.ParentElement.Is_ContentUse(this))
return false; return false;
if (false === UseContentPos && para_Math_Run === this.Content[this.Content.length - 1].Type) if (false === UseContentPos && para_Math_Run === this.Content[this.Content.length - 1].Type)
...@@ -3504,7 +3504,7 @@ CMathContent.prototype.Get_WordStartPos = function(SearchPos, ContentPos, Depth, ...@@ -3504,7 +3504,7 @@ CMathContent.prototype.Get_WordStartPos = function(SearchPos, ContentPos, Depth,
}; };
CMathContent.prototype.Get_WordEndPos = function(SearchPos, ContentPos, Depth, UseContentPos, StepEnd) CMathContent.prototype.Get_WordEndPos = function(SearchPos, ContentPos, Depth, UseContentPos, StepEnd)
{ {
if (!this.bRoot && true !== this.ParentElement.Is_ContentUse(this)) if (true !== this.ParentElement.Is_ContentUse(this))
return false; return false;
if (false === UseContentPos && para_Math_Run === this.Content[0].Type) if (false === UseContentPos && para_Math_Run === this.Content[0].Type)
......
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