Commit cbbe19cb authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 33813

parent 42aa4261
...@@ -358,7 +358,7 @@ function ConvertParagraphToWord(paragraph, docContent) ...@@ -358,7 +358,7 @@ function ConvertParagraphToWord(paragraph, docContent)
return new_paragraph; return new_paragraph;
} }
function CheckWordRunPr(Pr) function CheckWordRunPr(Pr, bMath)
{ {
var NewRPr = null; var NewRPr = null;
if(Pr.Unifill && Pr.Unifill.fill ) if(Pr.Unifill && Pr.Unifill.fill )
...@@ -425,11 +425,17 @@ function CheckWordRunPr(Pr) ...@@ -425,11 +425,17 @@ function CheckWordRunPr(Pr)
} }
} }
} }
if(bMath){
NewRPr = Pr.Copy();
NewRPr.RFonts.Set_All("Cambria Math", -1);
}
return NewRPr; return NewRPr;
} }
function CheckWordParagraphContent(aContent) function CheckWordParagraphContent(aContent)
{ {
var NewRPr;
for(var i = 0; i < aContent.length; ++i) for(var i = 0; i < aContent.length; ++i)
{ {
var oItem = aContent[i]; var oItem = aContent[i];
...@@ -437,7 +443,7 @@ function CheckWordParagraphContent(aContent) ...@@ -437,7 +443,7 @@ function CheckWordParagraphContent(aContent)
{ {
case para_Run: case para_Run:
{ {
var NewRPr = CheckWordRunPr(oItem.Pr); NewRPr = CheckWordRunPr(oItem.Pr);
if(NewRPr) if(NewRPr)
{ {
oItem.Set_Pr(NewRPr); oItem.Set_Pr(NewRPr);
...@@ -449,6 +455,23 @@ function CheckWordParagraphContent(aContent) ...@@ -449,6 +455,23 @@ function CheckWordParagraphContent(aContent)
CheckWordParagraphContent(oItem.Content); CheckWordParagraphContent(oItem.Content);
break; break;
} }
case para_Math:
{
if(oItem.Root && oItem.Root.Content)
{
CheckWordParagraphContent(oItem.Root.Content);
}
break;
}
case para_Math_Run:
{
NewRPr = CheckWordRunPr(oItem.Pr, true);
if(NewRPr)
{
oItem.Set_Pr(NewRPr);
}
break;
}
} }
} }
......
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