правка бага 21107

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

Excel/model/DrawingObjects/States.js

@@ -1404,7 +1404,7 @@ function TextAddState(drawingObjectsController, drawingObjects, textObject)
 
     this.onKeyPress = function(e)
     {
-        if(!(event.metaKey && window.USER_AGENT_SAFARI_MACOS))
+        if(!(e.metaKey && window.USER_AGENT_SAFARI_MACOS))
         {
             //var worksheet = this.drawingObjects.getWorksheet();
             //worksheet.collaborativeEditing.onStartCheckLock();
@@ -5116,13 +5116,13 @@ function DefaultKeyDownHandle(drawingObjectsController, e)
                         for(var i = 0; i < drawingObjectsController.selectedObjects.length; ++i)
                         {
                             var xfrm = drawingObjectsController.selectedObjects[i].spPr.xfrm;
-                            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);
-							
-							var x = xfrm.offX - 3;
-							var y = xfrm.offY;
-							var offset = drawingObjectsController.drawingObjects.checkGraphicObjectPosition(x, y, xfrm.extX, xfrm.extY);
-							x += offset.x;
-							y += offset.y;
+                            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);
+							
+							var x = xfrm.offX - 3;
+							var y = xfrm.offY;
+							var offset = drawingObjectsController.drawingObjects.checkGraphicObjectPosition(x, y, xfrm.extX, xfrm.extY);
+							x += offset.x;
+							y += offset.y;
 							
                             drawingObjectsController.selectedObjects[i].setPosition(x, y);
                             History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);
@@ -5204,13 +5204,13 @@ function DefaultKeyDownHandle(drawingObjectsController, e)
                         for(var i = 0; i < drawingObjectsController.selectedObjects.length; ++i)
                         {
                             var xfrm = drawingObjectsController.selectedObjects[i].spPr.xfrm;
-                            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);
-							
-							var x = xfrm.offX;
-							var y = xfrm.offY - 3;
-							var offset = drawingObjectsController.drawingObjects.checkGraphicObjectPosition(x, y, xfrm.extX, xfrm.extY);
-							x += offset.x;
-							y += offset.y;
+                            History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformUndo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);
+							
+							var x = xfrm.offX;
+							var y = xfrm.offY - 3;
+							var offset = drawingObjectsController.drawingObjects.checkGraphicObjectPosition(x, y, xfrm.extX, xfrm.extY);
+							x += offset.x;
+							y += offset.y;
 							
                             drawingObjectsController.selectedObjects[i].setPosition(x, y);
                             History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_RecalculateTransformRedo, null, null, new UndoRedoDataGraphicObjects(drawingObjectsController.selectedObjects[i].Id, new UndoRedoDataShapeRecalc()), null);