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

Common/FontsFreeType/font_map.js

@@ -1655,8 +1655,6 @@ CFontSelectList.prototype =
         if (undefined == _fontFamily)
             return _ret_obj;
 
-        var _info = window.g_font_infos[window.g_map_font_index[_fontFamily.Name]];
-
         var oFontStyle = FontStyle.FontStyleRegular;
         if (!italic && bold)
             oFontStyle = FontStyle.FontStyleBold;
@@ -1665,6 +1663,8 @@ CFontSelectList.prototype =
         else if (italic && bold)
             oFontStyle = FontStyle.FontStyleBoldItalic;
 
+        var _info = g_fontApplication.GetFontInfo(_fontFamily.Name, oFontStyle);
+
         var _id = _info.GetFontID(window.g_font_loader, oFontStyle);
         var _select = this.List[this.ListMap[_id.id]];
 
@@ -1794,6 +1794,11 @@ CFontSelectList.prototype =
             }
         }
 
+        if (_name == "")
+        {
+            _name = g_fontApplication.GetFontInfoName(_lang.DefaultFont);
+        }
+
         return _name;
     },