Commit 329eb58b authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Bug 27847 - Интервал параграфа и размер шрифта определяются некорректно на PPTX файле

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60283 954022d7-b5bf-4e40-9824-e11837661b57
parent 0e97671a
......@@ -479,7 +479,8 @@ CTextBody.prototype =
}
if(isRealNumber(font_scale))
{
this.checkParagraphContent(parg, font_scale, true);
var redFontSize = Math.round(parg.Get_CompiledPr(false).TextPr.FontSize*font_scale);
this.checkParagraphContent(parg, font_scale, true, redFontSize);
}
}
}
......@@ -489,7 +490,7 @@ CTextBody.prototype =
this.bodyPr.textFit = null;
},
checkParagraphContent: function(parg, fontScale, bParagraph)
checkParagraphContent: function(parg, fontScale, bParagraph, paragrRedFontSize)
{
for(var r = 0; r < parg.Content.length; ++r)
{
......@@ -502,19 +503,15 @@ CTextBody.prototype =
{
item.Set_FontSize(Math.round(item.Pr.FontSize*fontScale));
}
else if(bParagraph)
else
{
if(r === 0)
{
var par_font_size = parg.Get_CompiledPr(false).TextPr.FontSize;
item.Set_FontSize(Math.round(par_font_size*fontScale));
}
}
item.Set_FontSize(paragrRedFontSize);
}
break;
}
case para_Hyperlink:
{
this.checkParagraphContent(item, fontScale, false);
this.checkParagraphContent(item, fontScale, false, paragrRedFontSize);
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