git-svn-id:...

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

Common/Native/Wrappers/DrawingDocument.js

@@ -115,7 +115,12 @@ CDrawingDocument.prototype =
     // convert coords
     ConvertCoordsToCursorWR : function(x, y, pageIndex, transform)
     {
-        var _return = this.Native["ConvertCoordsToCursor"](x, y, pageIndex, transform);
+        var _return = null;
+        if (!transform)
+            _return = this.Native["ConvertCoordsToCursor"](x, y, pageIndex);
+        else
+            _return = this.Native["ConvertCoordsToCursor"](x, y, pageIndex,
+                transform.sx, transform.shy, transform.shx, transform.sy, transform.tx, transform.ty);
         return { X : _return[0], Y : _return[1], Error: _return[2] };
     },
 

Common/Native/Wrappers/TextMeasurerWrapper.js

@@ -53,7 +53,7 @@ CTextMeasurerWrapper.prototype =
             _lastSetUp.SetUpSize = font.FontSize;
             _lastSetUp.SetUpStyle = oFontStyle;
 
-            var _info = this.GetLoadInfoForMeasurer(window.g_font_infos[_lastSetUp.SetUpIndex], _lastSetUp.SetUpStyle);
+            var _info = GetLoadInfoForMeasurer(window.g_font_infos[_lastSetUp.SetUpIndex], _lastSetUp.SetUpStyle);
             var flag = 0;
             if (_info.NeedBold)     flag |= 0x01;
             if (_info.NeedItalic)   flag |= 0x02;
@@ -164,7 +164,7 @@ CTextMeasurerWrapper.prototype =
             _lastFont.SetUpSize = _lastFont.Size;
             _lastFont.SetUpStyle = _style;
 
-            var _info = this.GetLoadInfoForMeasurer(window.g_font_infos[_lastFont.SetUpIndex], _lastFont.SetUpStyle);
+            var _info = GetLoadInfoForMeasurer(window.g_font_infos[_lastFont.SetUpIndex], _lastFont.SetUpStyle);
             var flag = 0;
             if (_info.NeedBold)     flag |= 0x01;
             if (_info.NeedItalic)   flag |= 0x02;
@@ -226,10 +226,11 @@ CTextMeasurerWrapper.prototype =
     GetHeight : function()
     {
         return this.Height;
-    },
+    }
+};
 
-    GetLoadInfoForMeasurer : function(info, lStyle)
-    {
+function GetLoadInfoForMeasurer(info, lStyle)
+{
     // подбираем шрифт по стилю
     var sReturnName = info.Name;
     var bNeedBold   = false;
@@ -371,5 +372,4 @@ CTextMeasurerWrapper.prototype =
         SrcBold     : bSrcBold,
         SrcItalic   : bSrcItalic
     };
-    }
-};
+}
\ No newline at end of file
\ No newline at end of file