Commit 17fea51d authored by Ilya.Kirillov's avatar Ilya.Kirillov

Исправлен баг в предыдущей заливке.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60165 954022d7-b5bf-4e40-9824-e11837661b57
parent ed5ea31e
......@@ -5498,7 +5498,13 @@ ParaRun.prototype.Set_RFonts2 = function(RFonts)
this.Set_RFonts_Hint( undefined );
}
};
ParaRun.prototype.Set_RFont_ForMathRun = function()
{
this.Set_RFonts_Ascii({Name : "Cambria Math", Index : -1});
this.Set_RFonts_CS({Name : "Cambria Math", Index : -1});
this.Set_RFonts_EastAsia({Name : "Cambria Math", Index : -1});
this.Set_RFonts_HAnsi({Name : "Cambria Math", Index : -1});
};
ParaRun.prototype.Set_RFonts_Ascii = function(Value)
{
if ( Value !== this.Pr.RFonts.Ascii )
......
......@@ -1127,10 +1127,7 @@ CMathContent.prototype =
if(bCurrComp && !bLeftRun) // добавление пустого Run перед мат объектом
{
emptyRun = new ParaRun(null, true);
emptyRun.Set_RFonts_Ascii("Cambria Math");
emptyRun.Set_RFonts_CS("Cambria Math");
emptyRun.Set_RFonts_EastAsia("Cambria Math");
emptyRun.Set_RFonts_HAnsi("Cambria Math");
emptyRun.Set_RFont_ForMathRun();
ctrPrp = current.Get_CtrPrp();
......@@ -1176,10 +1173,7 @@ CMathContent.prototype =
if(len > 0 && this.Content[len - 1].Type == para_Math_Composition)
{
emptyRun = new ParaRun(null, true);
emptyRun.Set_RFonts_Ascii("Cambria Math");
emptyRun.Set_RFonts_CS("Cambria Math");
emptyRun.Set_RFonts_EastAsia("Cambria Math");
emptyRun.Set_RFonts_HAnsi("Cambria Math");
emptyRun.Set_RFont_ForMathRun();
ctrPrp = current.Get_CtrPrp();
......@@ -1239,10 +1233,7 @@ CMathContent.prototype =
if (this.Content.length < 1)
{
var NewMathRun = new ParaRun(null, true);
NewMathRun.Set_RFonts_Ascii("Cambria Math");
NewMathRun.Set_RFonts_CS("Cambria Math");
NewMathRun.Set_RFonts_EastAsia("Cambria Math");
NewMathRun.Set_RFonts_HAnsi("Cambria Math");
NewMathRun.Set_RFont_ForMathRun();
this.Add_ToContent(0, NewMathRun);
}
......@@ -2750,10 +2741,7 @@ CMathContent.prototype.Add_Text = function(sText, MathStyle)
MathRun.Add(oText, true);
}
MathRun.Set_RFonts_Ascii("Cambria Math");
MathRun.Set_RFonts_CS("Cambria Math");
MathRun.Set_RFonts_EastAsia("Cambria Math");
MathRun.Set_RFonts_HAnsi("Cambria Math");
MathRun.Set_RFont_ForMathRun();
if (undefined !== MathStyle && null !== MathStyle)
MathRun.Math_Apply_Style(MathStyle);
......
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