git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60938 954022d7-b5bf-4e40-9824-e11837661b57

Common/FontsFreeType/font_map.js

@@ -686,7 +686,8 @@ FD_FontDictionary.prototype =
         var _len = _arr.length;
         for (var i = 0; i < _len; i++)
         {
-            if (-1 != _arr[i].indexOf(sFontName) || sFontName.indexOf(_arr[i]))
+            // здесь точное равенство!
+            if (_arr[i] == sFontName)
                 return true;
         }
         return false;
@@ -1054,7 +1055,7 @@ CFontSelect.prototype =
         if ( sReqName == this.m_wsFontName )
             return 0;
 
-        if (-1 != sReqName.indexOf(this.m_wsFontName) || this.m_wsFontName.indexOf(sReqName))
+        if (-1 != sReqName.indexOf(this.m_wsFontName) || -1 != this.m_wsFontName.indexOf(sReqName))
             return 1000;
 
         if (g_fontApplication.g_fontDictionary.CheckLikeFonts(this.m_wsFontName, sReqName))

Word/Drawing/GlobalLoaders.js

@@ -224,6 +224,7 @@
 
             this.fonts_loading[this.fonts_loading.length] = fontinfo;
             this.fonts_loading[this.fonts_loading.length - 1].NeedStyles = (need_styles == undefined) ? 0x0F : need_styles;
+			return fontinfo;
         };
 
         this.AddLoadFontsNotPick = function(info, need_styles)
@@ -255,7 +256,7 @@
             {
                 if (_fonts[i].Type != FONT_TYPE_EMBEDDED)
                 {
-                    this.AddLoadFonts(_fonts[i].name, _fonts[i].NeedStyles);
+                    var info = this.AddLoadFonts(_fonts[i].name, _fonts[i].NeedStyles);
 
                     if (info.Type == FONT_TYPE_ADDITIONAL)
                     {