Commit cdd624cf authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с неправильной работой настроек буквицы (баг 22635).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56080 954022d7-b5bf-4e40-9824-e11837661b57
parent f1e3bed6
......@@ -13977,6 +13977,7 @@ Paragraph.prototype =
}
// TODO: Пока возвращаем всегда шрифт лежащий в Ascii, в будущем надо будет это переделать
if ( undefined !== TextPr.RFonts && null !== TextPr.RFonts )
TextPr.FontFamily = TextPr.RFonts.Ascii;
return TextPr;
......@@ -16561,6 +16562,8 @@ Paragraph.prototype =
this.Set_Spacing( { LineRule : linerule_Exact, Line : FramePr.Lines * LineH }, false );
this.Update_DropCapByLines( this.Internal_CalculateTextPr( this.Internal_GetStartPos() ), FramePr.Lines, LineH, LineTA, LineTD, Before );
NewFramePr.Lines = FramePr.Lines;
}
if ( undefined != FramePr.FontFamily )
......@@ -16872,7 +16875,13 @@ Paragraph.prototype =
break;
}
var TextPr = FirstFramePara.Internal_CalculateTextPr(0);
var TextPr = FirstFramePara.Get_FirstRunPr();
if (undefined === TextPr.RFonts || undefined === TextPr.RFonts.Ascii)
{
TextPr = this.Get_CompiledPr2(false).TextPr;
}
FramePr.FontFamily =
{
Name : TextPr.RFonts.Ascii.Name,
......
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