Commit b851dcde authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=25675 - [Copy&Paste] Ошибка в консоли при...

http://bugzserver/show_bug.cgi?id=25675 - [Copy&Paste] Ошибка в консоли при копировании таблицы из CDE в CSE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57470 954022d7-b5bf-4e40-9824-e11837661b57
parent 5760ef0d
......@@ -4125,6 +4125,7 @@
var formatText, fontFamily, colorText;
var paragraphFontSize = paraPr.TextPr.FontSize;
var paragraphFontFamily = paraPr.TextPr && paraPr.TextPr.FontFamily ? paraPr.TextPr.FontFamily.Name : "Arial";
var paragraphBold = paraPr.TextPr.Bold;
var paragraphItalic = paraPr.TextPr.Italic;
var paragraphStrikeout = paraPr.TextPr.Strikeout;
......@@ -4142,7 +4143,7 @@
else
colorText = null;
fontFamily = cTextPr.fontFamily ? fontFamily : cTextPr.RFonts.CS ? cTextPr.RFonts.CS.Name : paragraphFontFamily;
fontFamily = cTextPr.fontFamily ? cTextPr.fontFamily.Name : cTextPr.RFonts.CS ? cTextPr.RFonts.CS.Name : paragraphFontFamily;
this.fontsNew[fontFamily] = 1;
var verticalAlign;
......
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