Fix #20080

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

Common/Charts/DrawingObjects.js

@@ -2724,16 +2724,13 @@ function DrawingObjects() {
 	_this.cloneDrawingObject = function(obj) {
 
 		var copyObject = _this.createDrawingObject();
-		
-		copyObject.worksheet = worksheet;
 
 		copyObject.Type = obj.Type;
 		copyObject.Pos.X = obj.Pos.X;
 		copyObject.Pos.Y = obj.Pos.Y;
 		copyObject.ext.cx = obj.ext.cx;
 		copyObject.ext.cy = obj.ext.cy;
-		copyObject.imageUrl = obj.imageUrl;
-
+		
 		copyObject.from.col = obj.from.col;
 		copyObject.from.colOff = obj.from.colOff;
 		copyObject.from.row = obj.from.row;

Excel/view/EventsController.js

@@ -925,7 +925,7 @@
 				
 				var graphicObjects = t.handlers.trigger("getSelectedGraphicObjects");
 				if ( graphicObjects.length && t.enableKeyEvents ) {
-					if ( !(event.ctrlKey && (event.which == 99) && (event.which == 118)) ) {		// Mozilla Firefox Fix #20080
+					if (!( (event.ctrlKey || event.metaKey) && (event.which == 99 || event.which == 118) )) {		// Mozilla Firefox Fix #20080
 						if (t.handlers.trigger("graphicObjectWindowKeyPress", event))
 							return true;
 					}