Commit 9372830e authored by Anna.Pavlova's avatar Anna.Pavlova

Правка strikeout

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59722 954022d7-b5bf-4e40-9824-e11837661b57
parent 1d711110
...@@ -119,7 +119,7 @@ CMathBase.prototype = ...@@ -119,7 +119,7 @@ CMathBase.prototype =
if(!this.elements[i][j].IsJustDraw()) if(!this.elements[i][j].IsJustDraw())
this.elements[i][j].NeedCompiledCtrPr(); this.elements[i][j].NeedCompiledCtrPr();
}, },
Get_CompiledCtrPrp: function() Get_CompiledCtrPrp: function(bAllowInline)
{ {
this.Set_CompiledCtrPrp(this.Parent, this.ParaMath); this.Set_CompiledCtrPrp(this.Parent, this.ParaMath);
...@@ -132,10 +132,13 @@ CMathBase.prototype = ...@@ -132,10 +132,13 @@ CMathBase.prototype =
else else
{ {
CompiledCtrPrp = this.Get_CompiledCtrPrp_2(); CompiledCtrPrp = this.Get_CompiledCtrPrp_2();
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value);
if(bAllowInline !== false)
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.Parent.Get_CompiledArgSize().value);
} }
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.ArgSize.value);// для настроек inline формул if(bAllowInline !== false)
CompiledCtrPrp.FontSize = this.ParaMath.ApplyArgSize(CompiledCtrPrp.FontSize, this.ArgSize.value);// для настроек inline формул
return CompiledCtrPrp; return CompiledCtrPrp;
}, },
...@@ -1153,7 +1156,7 @@ CMathBase.prototype.Draw_HighLights = function(PDSH, bAll) ...@@ -1153,7 +1156,7 @@ CMathBase.prototype.Draw_HighLights = function(PDSH, bAll)
}; };
CMathBase.prototype.Draw_Lines = function(PDSL) CMathBase.prototype.Draw_Lines = function(PDSL)
{ {
var CtrPrp = this.Get_CompiledCtrPrp(); var CtrPrp = this.Get_CompiledCtrPrp(false);
var aStrikeout = PDSL.Strikeout; var aStrikeout = PDSL.Strikeout;
var aDStrikeout = PDSL.DStrikeout; var aDStrikeout = PDSL.DStrikeout;
......
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