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

http://bugzserver/show_bug.cgi?id=26832 - [Copy&Paste] Не сохраняется цвет...

http://bugzserver/show_bug.cgi?id=26832 -  [Copy&Paste] Не сохраняется цвет текста при копировании из CSE в CD

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58759 954022d7-b5bf-4e40-9824-e11837661b57
parent 620ef446
...@@ -2451,7 +2451,14 @@ ...@@ -2451,7 +2451,14 @@
} }
} }
f = val[i].format; f = val[i].format;
if (f.c) {span.style.color = number2color(f.c);} if (f.c)
{
if(f.c && f.c.rgb)
span.style.color = number2color(f.c.rgb);
else
span.style.color = number2color(f.c);
}
if (f.fn !== defFN) {span.style.fontFamily = f.fn;} if (f.fn !== defFN) {span.style.fontFamily = f.fn;}
if (f.fs !== defFS) {span.style.fontSize = f.fs + 'pt';} if (f.fs !== defFS) {span.style.fontSize = f.fs + 'pt';}
if (f.b) {span.style.fontWeight = 'bold';} if (f.b) {span.style.fontWeight = 'bold';}
......
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