Commit ce06172d authored by konovalovsergey's avatar konovalovsergey

fix bug 32797

parent 11f48eb0
...@@ -6829,7 +6829,7 @@ ...@@ -6829,7 +6829,7 @@
}); });
this.wb.clrSchemeMap = AscFormat.GenerateDefaultColorMap(); this.wb.clrSchemeMap = AscFormat.GenerateDefaultColorMap();
if(null == this.wb.theme) if(null == this.wb.theme)
this.wb.theme = AscFormat.GenerateDefaultTheme(this.wb); this.wb.theme = AscFormat.GenerateDefaultTheme(this.wb, 'Calibri');
Asc.getBinaryOtherTableGVar(this.wb); Asc.getBinaryOtherTableGVar(this.wb);
......
...@@ -11033,17 +11033,20 @@ TextListStyle.prototype = ...@@ -11033,17 +11033,20 @@ TextListStyle.prototype =
}; };
// DEFAULT OBJECTS // DEFAULT OBJECTS
function GenerateDefaultTheme(presentation) function GenerateDefaultTheme(presentation, opt_fontName)
{ {
return ExecuteNoHistory(function() return ExecuteNoHistory(function()
{ {
if (!opt_fontName) {
opt_fontName = "Arial";
}
var theme = new CTheme(); var theme = new CTheme();
theme.presentation = presentation; theme.presentation = presentation;
theme.setFontScheme(new FontScheme()); theme.setFontScheme(new FontScheme());
theme.themeElements.fontScheme.setMajorFont(new FontCollection(theme.themeElements.fontScheme)); theme.themeElements.fontScheme.setMajorFont(new FontCollection(theme.themeElements.fontScheme));
theme.themeElements.fontScheme.setMinorFont(new FontCollection(theme.themeElements.fontScheme)); theme.themeElements.fontScheme.setMinorFont(new FontCollection(theme.themeElements.fontScheme));
theme.themeElements.fontScheme.majorFont.setLatin("Arial"); theme.themeElements.fontScheme.majorFont.setLatin(opt_fontName);
theme.themeElements.fontScheme.minorFont.setLatin("Arial"); theme.themeElements.fontScheme.minorFont.setLatin(opt_fontName);
var scheme = theme.themeElements.clrScheme; var scheme = theme.themeElements.clrScheme;
......
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