Skip to content

S
sdkjs
Commit a28cf742 authored by konovalovsergey's avatar konovalovsergey
Browse files
Options

merge styles fix

parent f005142d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cell/model/WorkbookElems.js
View file @ a28cf742
...@@ -560,9 +560,9 @@ var g_oFontProperties = { ...@@ -560,9 +560,9 @@ var g_oFontProperties = {
oRes.fn = this.fn || font.fn; oRes.fn = this.fn || font.fn;
oRes.scheme = this.scheme || font.scheme; oRes.scheme = this.scheme || font.scheme;
oRes.fs = this.fs || font.fs; oRes.fs = this.fs || font.fs;
oRes.b = this.b; oRes.b = this.b || font.b;
oRes.i = this.i; oRes.i = this.i || font.i;
oRes.s = this.s; oRes.s = this.s || font.s;
oRes.u = this.u || font.u; oRes.u = this.u || font.u;
//заглушка excel при merge стилей игнорирует default цвет //заглушка excel при merge стилей игнорирует default цвет
if (isTable && this.c && this.c.isEqual(g_oDefaultFormat.Font.c)) { if (isTable && this.c && this.c.isEqual(g_oDefaultFormat.Font.c)) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7