Commit 7e252aad authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

ASCW3

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56677 954022d7-b5bf-4e40-9824-e11837661b57
parent 291bf469
...@@ -380,7 +380,8 @@ ...@@ -380,7 +380,8 @@
standarts = []; standarts = [];
for (var i = 0; i < window.g_font_infos.length; i++) for (var i = 0; i < window.g_font_infos.length; i++)
{ {
standarts.push(window.g_font_infos[i].Name); if (window.g_font_infos[i].Name != "ASCW3")
standarts.push(window.g_font_infos[i].Name);
} }
} }
...@@ -443,8 +444,11 @@ ...@@ -443,8 +444,11 @@
if (info.Type == FONT_TYPE_ADDITIONAL) if (info.Type == FONT_TYPE_ADDITIONAL)
{ {
var __font = new CFont(info.Name, "", info.Type, info.Thumbnail); if (info.name != "ASCW3")
gui_fonts[gui_count++] = __font; {
var __font = new CFont(info.Name, "", info.Type, info.Thumbnail);
gui_fonts[gui_count++] = __font;
}
} }
} }
else else
......
...@@ -204,7 +204,8 @@ ...@@ -204,7 +204,8 @@
standarts = []; standarts = [];
for (var i = 0; i < window.g_font_infos.length; i++) for (var i = 0; i < window.g_font_infos.length; i++)
{ {
standarts.push(window.g_font_infos[i].Name); if (window.g_font_infos[i].Name != "ASCW3")
standarts.push(window.g_font_infos[i].Name);
} }
} }
...@@ -249,11 +250,14 @@ ...@@ -249,11 +250,14 @@
var info = this.fontInfos[this.map_font_index[_fonts[i].name]]; var info = this.fontInfos[this.map_font_index[_fonts[i].name]];
this.AddLoadFonts(info, _fonts[i].NeedStyles); this.AddLoadFonts(info, _fonts[i].NeedStyles);
if (info.Type == FONT_TYPE_ADDITIONAL) if (info.Type == FONT_TYPE_ADDITIONAL)
{ {
var __font = new CFont(info.Name, "", info.Type, info.Thumbnail); if (info.name != "ASCW3")
gui_fonts[gui_count++] = __font; {
var __font = new CFont(info.Name, "", info.Type, info.Thumbnail);
gui_fonts[gui_count++] = __font;
}
} }
} }
else else
......
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