формулы

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

Common/Native/Wrappers/DrawingStream.js

@@ -562,7 +562,7 @@ CDrawingStream.prototype =
     },
     p_width : function(w)
     {
-        this.Native["PD_p_width"](w);
+        this.Native["PD_p_width"](w / 1000);
     },
     // brush methods
     b_color1 : function(r,g,b,a)

Common/Native/Wrappers/TextMeasurerWrapper.js

@@ -202,8 +202,13 @@ CTextMeasurerWrapper.prototype =
         if (null != this.LastFontOriginInfo.Replace)
             lUnicode = g_fontApplication.GetReplaceGlyph(lUnicode, this.LastFontOriginInfo.Replace);
 
-        var _width = this.Measurer["MeasureChar"](lUnicode);
-        return { Width : _width, Height : 0 };
+        var _bounds = this.Measurer["GetDrawingBox"](lUnicode);
+
+        return {
+            Width  : _bounds[0],
+            Ascent : _bounds[4],
+            Height : _bounds[4] - _bounds[3]
+        };
     },
     Measure2Code : function(lUnicode)
     {