Commit 18f5a009 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

баг с дефолтовым шрифтом для подбора

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60973 954022d7-b5bf-4e40-9824-e11837661b57
parent 0bc416db
......@@ -673,6 +673,9 @@ FD_FontDictionary.prototype =
if ( undefined != DefaultIndex && nDefPenalty == nMinPenalty )
nMinIndex = DefaultIndex;
if (undefined == DefaultIndex)
return nMinIndex;
return oList[nMinIndex];
},
......@@ -2690,15 +2693,7 @@ function CApplicationFonts()
var oSelect = new CFontSelectFormat();
oSelect.wsName = "Arial";
var _font = this.g_fontDictionary.GetFontIndex(oSelect, this.g_fontSelections.List, undefined);
if (null != _font)
{
this.DefaultIndex = 0;
}
else
{
this.DefaultIndex = window.g_map_font_index[_font.m_wsFontName];
}
this.DefaultIndex = this.g_fontDictionary.GetFontIndex(oSelect, this.g_fontSelections.List, undefined);
};
this.LoadFont = function(name, font_loader, fontManager, fEmSize, lStyle, dHorDpi, dVerDpi, transform)
......
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