fix Bug 34141

5e8274b2 · Sergey Luzyanin · 0f313626 · 5e8274b2
Commit 5e8274b2 authored Mar 11, 2017 by Sergey Luzyanin
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

cell/view/WorksheetView.js cell/view/WorksheetView.js +8 -1

No files found.
--- a/cell/view/WorksheetView.js
+++ b/cell/view/WorksheetView.js
@@ -7155,7 +7155,14 @@
            objectInfo.font.strikeout = textPr.Strikeout;
            objectInfo.font.subscript = textPr.VertAlign == AscCommon.vertalign_SubScript;
            objectInfo.font.superscript = textPr.VertAlign == AscCommon.vertalign_SuperScript;
-            if (textPr.Color) {
+            if(textPr.Unifill){
+                if(theme){
+                    textPr.Unifill.check(theme, this.objectRender.controller.getColorMap());
+                }
+                var oColor = textPr.Unifill.getRGBAColor();
+                objectInfo.font.color = AscCommon.CreateAscColorCustom(oColor.R, oColor.G, oColor.B);
+            }
+            else if (textPr.Color) {
                objectInfo.font.color = AscCommon.CreateAscColorCustom(textPr.Color.r, textPr.Color.g, textPr.Color.b);
            }