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

Common/Native/Wrappers/DrawingDocument.js

@@ -1263,6 +1263,22 @@ CDrawingDocument.prototype =
         return true;
     },
 
+    OnCheckMouseDown : function(e)
+    {
+        check_MouseDownEvent(e, true);
+
+        var pos = null;
+        if (this.AutoShapesTrackLockPageNum == -1)
+            pos = this.__DD_ConvertCoordsFromCursor(global_mouseEvent.X, global_mouseEvent.Y);
+        else
+            pos = this.__DD_ConvetToPageCoords(global_mouseEvent.X, global_mouseEvent.Y, this.AutoShapesTrackLockPageNum);
+
+        global_mouseEvent.KoefPixToMM = 5;
+        var _isDrawings = this.LogicDocument.DrawingObjects.isPointInDrawingObjects2(pos.X, pos.Y, pos.Page);
+        global_mouseEvent.KoefPixToMM = 1;
+        return _isDrawings;
+    },
+
     OnMouseDown : function(e)
     {
         check_MouseDownEvent(e, true);
@@ -1304,7 +1320,9 @@ CDrawingDocument.prototype =
                 return;
 
             this.Native["DD_NeedScrollToTargetFlag"](true);
+            //global_mouseEvent.KoefPixToMM = 5;
             this.LogicDocument.OnMouseDown(global_mouseEvent, pos.X, pos.Y, pos.Page);
+            //global_mouseEvent.KoefPixToMM = 1;
             this.Native["DD_NeedScrollToTargetFlag"](false);
         }
 

Common/Native/Wrappers/api.js

@@ -43,6 +43,10 @@ asc_docs_api.prototype["Call_OnMouseMove"] = function(e)
 {
     this.WordControl.m_oDrawingDocument.OnMouseMove(e);
 };
+asc_docs_api.prototype["Call_OnCheckMouseDown"] = function(e)
+{
+    this.WordControl.m_oDrawingDocument.OnCheckMouseDown(e);
+};
 
 asc_docs_api.prototype["Call_OnKeyDown"] = function(e)
 {
@@ -3455,7 +3459,7 @@ function asc_menu_ReadAscFill(_params, _cursor)
 {
     var _fill = new CAscFill();
 
-    _fill.type = c_oAscFill.FILL_TYPE_NOFILL;
+    //_fill.type = c_oAscFill.FILL_TYPE_NOFILL;
     var _continue = true;
     while (_continue)
     {

Common/Native/native.js

@@ -398,6 +398,10 @@ window.native.Call_OnMouseMove = function(e)
 {
     return _api.Call_OnMouseMove(e);
 };
+window.native.Call_OnCheckMouseDown = function(e)
+{
+    return _api.Call_OnCheckMouseDown(e);
+};
 
 window.native.Call_OnKeyDown = function(e)
 {