Commit 2ddf4901 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@53260 954022d7-b5bf-4e40-9824-e11837661b57
parent 27fc20a9
......@@ -2322,6 +2322,18 @@ CDocument.prototype =
if ( null == this.Selection.Data || this.Selection.Data.length <= 0 )
break;
if ( undefined != ParaItem.Value.FontFamily )
{
var FName = ParaItem.Value.FontFamily.Name;
var FIndex = ParaItem.Value.FontFamily.Index;
ParaItem.Value.RFonts = new CRFonts();
ParaItem.Value.RFonts.Ascii = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.EastAsia = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.HAnsi = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.CS = { Name : FName, Index : FIndex };
}
var NumPr = this.Content[this.Selection.Data[0]].Numbering_Get();
var AbstrNum = this.Numbering.Get_AbstractNum( NumPr.NumId );
AbstrNum.Apply_TextPr( NumPr.Lvl, ParaItem.Value );
......@@ -6997,6 +7009,9 @@ CDocument.prototype =
End = Temp;
}
Start = Math.max( 0, Start );
End = Math.min( this.Content.length - 1, End );
for ( var Index = Start; Index <= End; Index++ )
{
this.Content[Index].Selection_Remove();
......
......@@ -1988,6 +1988,18 @@ CDocumentContent.prototype =
if ( null == this.Selection.Data || this.Selection.Data.length <= 0 )
break;
if ( undefined != ParaItem.Value.FontFamily )
{
var FName = ParaItem.Value.FontFamily.Name;
var FIndex = ParaItem.Value.FontFamily.Index;
ParaItem.Value.RFonts = new CRFonts();
ParaItem.Value.RFonts.Ascii = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.EastAsia = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.HAnsi = { Name : FName, Index : FIndex };
ParaItem.Value.RFonts.CS = { Name : FName, Index : FIndex };
}
var NumPr = this.Content[this.Selection.Data[0]].Numbering_Get();
var AbstrNum = this.Numbering.Get_AbstractNum( NumPr.NumId );
AbstrNum.Apply_TextPr( NumPr.Lvl, ParaItem.Value );
......
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