Commit 57897419 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

fontfamily

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49598 954022d7-b5bf-4e40-9824-e11837661b57
parent 0ae012d1
...@@ -3368,13 +3368,11 @@ PasteProcessor.prototype = ...@@ -3368,13 +3368,11 @@ PasteProcessor.prototype =
if(node != oFirstTextChild) if(node != oFirstTextChild)
{ {
var oLvl = AbstractNum.Lvl[0]; var oLvl = AbstractNum.Lvl[0];
var sFontFamily = null; var oTextPr = this._read_rPr(oFirstTextChild);
if(numbering_numfmt_Bullet == num) if(numbering_numfmt_Bullet == num)
sFontFamily = oLvl.TextPr.FontFamily; oTextPr.RFonts = oLvl.TextPr.RFonts.Copy();
//�������� ��������� �� node //�������� ��������� �� node
oLvl.TextPr = this._read_rPr(oFirstTextChild); AbstractNum.Apply_TextPr(0, oTextPr);
if(null != sFontFamily)
oLvl.TextPr.FontFamily = sFontFamily;
} }
} }
Para.Numbering_Add( NumId, 0 ); Para.Numbering_Add( NumId, 0 );
...@@ -3487,7 +3485,6 @@ PasteProcessor.prototype = ...@@ -3487,7 +3485,6 @@ PasteProcessor.prototype =
var oFontItem = this.oFonts[font_family]; var oFontItem = this.oFonts[font_family];
if(null != oFontItem && null != oFontItem.Name) if(null != oFontItem && null != oFontItem.Name)
{ {
rPr.FontFamily = {Name: oFontItem.Name, Index: oFontItem.Index};
rPr.RFonts.Ascii = {Name: oFontItem.Name, Index: oFontItem.Index}; rPr.RFonts.Ascii = {Name: oFontItem.Name, Index: oFontItem.Index};
rPr.RFonts.HAnsi = {Name: oFontItem.Name, Index: oFontItem.Index}; rPr.RFonts.HAnsi = {Name: oFontItem.Name, Index: oFontItem.Index};
rPr.RFonts.CS = {Name: oFontItem.Name, Index: oFontItem.Index}; rPr.RFonts.CS = {Name: oFontItem.Name, Index: oFontItem.Index};
......
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