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