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

Common/FontsFreeType/font_engine.js

@@ -1456,7 +1456,11 @@ function FT_MulDiv(a, b, c)
 function FT_MulFix(a, b)
 {
     if (a > 2147483647 || b > 2147483647)
-        alert("error");
+    {
+		//alert("error");
+		a &= 0xFFFFFFFF;
+		b &= 0xFFFFFFFF;
+	}
 
     if (a == 0 || b == 0x10000)
         return a;

Word/Drawing/Graphics.js

@@ -1118,7 +1118,7 @@ CGraphics.prototype =
     font : function(font_id,font_size)
     {
         g_font_infos[g_map_font_index[font_id]].LoadFont(editor.FontLoader, this.IsUseFonts2 ? this.m_oFontManager2 : this.m_oFontManager,
-            font_size, 0, this.m_dDpiX, this.m_dDpiY, this.m_oTransform);
+            Math.max(font_size, 1), 0, this.m_dDpiX, this.m_dDpiY, this.m_oTransform);
     },
     SetFont : function(font)
     {