подбор шрифтов на клиенте эксель

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

Common/FontsFreeType/font_map.js

@@ -2708,7 +2708,7 @@ function CApplicationFonts()
 
         // используем стиль, пришедший извне, а не стиль _font
         // так как подвираем вез стиля в Web версии
-        window.g_font_infos[font_name_index].LoadFont(window.g_font_loader, fontManager, fEmSize, /*_font.GetStyle()*/lStyle, dHorDpi, dVerDpi, transform);
+        return window.g_font_infos[font_name_index].LoadFont(window.g_font_loader, fontManager, fEmSize, /*_font.GetStyle()*/lStyle, dHorDpi, dVerDpi, transform);
     };
 
     this.GetFontFile = function(name, lStyle)

Excel/graphics/DrawingContext.js

@@ -841,12 +841,6 @@
 	DrawingContext.prototype.setFont = function (font, angle) {
 		var italic, bold, fontStyle, r;
 
-		if (font.FontFamily.Index === undefined ||
-			font.FontFamily.Index === null ||
-			font.FontFamily.Index === -1) {
-			font.FontFamily.Index = window.g_map_font_index[font.FontFamily.Name];
-		}
-
 		this.font.copyFrom(font);
 
 		italic = true === font.Italic;
@@ -861,16 +855,14 @@
 			fontStyle = FontStyle.FontStyleBoldItalic;
 
 		if (angle && 0 != angle) {
-			r = window.g_font_infos[ font.FontFamily.Index ].LoadFont(
-				window.g_font_loader, this.fmgrGraphics[1], font.FontSize, fontStyle, this.ppiX, this.ppiY);
+			r = g_fontApplication.LoadFont(font.FontFamily.Name, window.g_font_loader, this.fmgrGraphics[1], font.FontSize, fontStyle, this.ppiX, this.ppiY);
 
 			this.fmgrGraphics[1].SetTextMatrix(
 				this._mt.sx, this._mt.shy, this._mt.shx, this._mt.sy, this._mt.tx, this._mt.ty);
 		} else {
-			r = window.g_font_infos[ font.FontFamily.Index ].LoadFont(
-				window.g_font_loader, this.fmgrGraphics[0], font.FontSize, fontStyle, this.ppiX, this.ppiY);
-			window.g_font_infos[ font.FontFamily.Index ].LoadFont(
-				window.g_font_loader, this.fmgrGraphics[3], font.FontSize, fontStyle, this.ppiX, this.ppiY);
+
+		    r = g_fontApplication.LoadFont(font.FontFamily.Name, window.g_font_loader, this.fmgrGraphics[0], font.FontSize, fontStyle, this.ppiX, this.ppiY);
+		    g_fontApplication.LoadFont(font.FontFamily.Name, window.g_font_loader, this.fmgrGraphics[3], font.FontSize, fontStyle, this.ppiX, this.ppiY);
 		}
 
 		if (r === false) {