Commit 238f7f77 authored by Oleg Korshul's avatar Oleg Korshul

font picker for slide numbers

parent 3e32cdde
...@@ -4295,7 +4295,8 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex) ...@@ -4295,7 +4295,8 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex)
} }
else else
{ {
this.txWarpStruct2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap); if (this.txWarpStruct2)
this.txWarpStruct2.draw(graphics, this.transformTextWordArt2, oTheme, oColorMap);
} }
} }
} }
......
...@@ -4129,6 +4129,8 @@ function CThumbnailsManager() ...@@ -4129,6 +4129,8 @@ function CThumbnailsManager()
// инициализация шрифта // инициализация шрифта
this.SetFont = function(font) this.SetFont = function(font)
{ {
font.FontFamily.Name = g_fontApplication.GetFontFileWeb(font.FontFamily.Name, 0).m_wsFontName;
if (-1 == font.FontFamily.Index) if (-1 == font.FontFamily.Index)
font.FontFamily.Index = AscFonts.g_map_font_index[font.FontFamily.Name]; font.FontFamily.Index = AscFonts.g_map_font_index[font.FontFamily.Name];
......
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