Commit ddda7a77 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Поправила баг : не отдавался наверх italic true после открытия файла для мат текста

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58560 954022d7-b5bf-4e40-9824-e11837661b57
parent fe11e491
...@@ -7967,7 +7967,7 @@ ParaRun.prototype.Math_Apply_Style = function(Value) ...@@ -7967,7 +7967,7 @@ ParaRun.prototype.Math_Apply_Style = function(Value)
ParaRun.prototype.IsNormalText = function() ParaRun.prototype.IsNormalText = function()
{ {
var comp_MPrp = this.MathPrp.GetCompiled_ScrStyles(); var comp_MPrp = this.MathPrp.GetCompiled_ScrStyles();
return comp_MPrp.nor == true; return (comp_MPrp.nor === true);
} }
ParaRun.prototype.getPropsForWrite = function() ParaRun.prototype.getPropsForWrite = function()
{ {
...@@ -7982,16 +7982,6 @@ ParaRun.prototype.Math_SetGaps = function(GapsInfo) ...@@ -7982,16 +7982,6 @@ ParaRun.prototype.Math_SetGaps = function(GapsInfo)
this.Paragraph = GapsInfo.ParaMath.Paragraph; this.Paragraph = GapsInfo.ParaMath.Paragraph;
var oWPrp = this.Get_CompiledPr(true); var oWPrp = this.Get_CompiledPr(true);
//this.Parent.ParaMath.ApplyArgSize(oWPrp, this.Parent.argSize);
/*if(!this.IsNormalText()) // выставляем false, чтобы не применился наклон к спец символам
{
oWPrp.Italic = false;
oWPrp.Bold = false;
}*/
//g_oTextMeasurer.SetFont(oWPrp);
for (var Pos = 0 ; Pos < this.Content.length; Pos++ ) for (var Pos = 0 ; Pos < this.Content.length; Pos++ )
{ {
if( !this.Content[Pos].IsAlignPoint() ) if( !this.Content[Pos].IsAlignPoint() )
...@@ -8028,14 +8018,6 @@ ParaRun.prototype.IsAccent = function() ...@@ -8028,14 +8018,6 @@ ParaRun.prototype.IsAccent = function()
{ {
return this.Parent.IsAccent(); return this.Parent.IsAccent();
} }
ParaRun.prototype.Math_ApplyGaps = function()
{
for (var Pos = 0 ; Pos < this.Content.length; Pos++ )
{
this.Content[Pos].ApplyGaps();
this.size.width += this.Content[Pos].GapLeft + this.Content[Pos].GapRight;
}
}
ParaRun.prototype.GetCompiled_ScrStyles = function() ParaRun.prototype.GetCompiled_ScrStyles = function()
{ {
return this.MathPrp.GetCompiled_ScrStyles(); return this.MathPrp.GetCompiled_ScrStyles();
......
...@@ -830,8 +830,17 @@ CMPrp.prototype = ...@@ -830,8 +830,17 @@ CMPrp.prototype =
{ {
var textPrp = new CTextPr(); var textPrp = new CTextPr();
textPrp.Italic = this.sty == STY_BI || this.sty == STY_ITALIC; if(this.sty == undefined)
textPrp.Bold = this.sty == STY_BI || this.sty == STY_BOLD; {
textPrp.Italic = true;
textPrp.Bold = false;
}
else
{
textPrp.Italic = this.sty == STY_BI || this.sty == STY_ITALIC;
textPrp.Bold = this.sty == STY_BI || this.sty == STY_BOLD;
}
return textPrp; return textPrp;
}, },
......
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