Commit 5e8274b2 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 34141

parent 0f313626
...@@ -7155,7 +7155,14 @@ ...@@ -7155,7 +7155,14 @@
objectInfo.font.strikeout = textPr.Strikeout; objectInfo.font.strikeout = textPr.Strikeout;
objectInfo.font.subscript = textPr.VertAlign == AscCommon.vertalign_SubScript; objectInfo.font.subscript = textPr.VertAlign == AscCommon.vertalign_SubScript;
objectInfo.font.superscript = textPr.VertAlign == AscCommon.vertalign_SuperScript; 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); objectInfo.font.color = AscCommon.CreateAscColorCustom(textPr.Color.r, textPr.Color.g, textPr.Color.b);
} }
......
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