Commit a9e2491a authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Bug 22356 - [Charts] Убрать возможность копирования диаграммы во фрейме через ctrl/cmd

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57370 954022d7-b5bf-4e40-9824-e11837661b57
parent adb582e1
...@@ -267,7 +267,7 @@ RotateState.prototype = ...@@ -267,7 +267,7 @@ RotateState.prototype =
var drawingObjects = this.drawingObjects; var drawingObjects = this.drawingObjects;
var oThis = this; var oThis = this;
if(e.CtrlKey && this instanceof MoveState) if(e.CtrlKey && this instanceof MoveState && !(asc["editor"].isChartEditor === true))
{ {
var i, copy; var i, copy;
this.drawingObjects.resetSelection(); this.drawingObjects.resetSelection();
...@@ -1087,7 +1087,7 @@ SplineBezierState2.prototype = ...@@ -1087,7 +1087,7 @@ SplineBezierState2.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.x; tr_x = tr_point.x;
tr_y = tr_point.y; tr_y = tr_point.y;
} }
...@@ -1136,7 +1136,7 @@ SplineBezierState3.prototype = ...@@ -1136,7 +1136,7 @@ SplineBezierState3.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.X; tr_x = tr_point.X;
tr_y = tr_point.Y; tr_y = tr_point.Y;
} }
...@@ -1238,7 +1238,7 @@ SplineBezierState4.prototype = ...@@ -1238,7 +1238,7 @@ SplineBezierState4.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.X; tr_x = tr_point.X;
tr_y = tr_point.Y; tr_y = tr_point.Y;
} }
...@@ -1290,7 +1290,7 @@ SplineBezierState4.prototype = ...@@ -1290,7 +1290,7 @@ SplineBezierState4.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.X; tr_x = tr_point.X;
tr_y = tr_point.Y; tr_y = tr_point.Y;
} }
...@@ -1357,7 +1357,7 @@ SplineBezierState5.prototype = ...@@ -1357,7 +1357,7 @@ SplineBezierState5.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.X; tr_x = tr_point.X;
tr_y = tr_point.Y; tr_y = tr_point.Y;
} }
...@@ -1564,7 +1564,7 @@ AddPolyLine2State2.prototype = ...@@ -1564,7 +1564,7 @@ AddPolyLine2State2.prototype =
} }
else else
{ {
var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.graphicObjects.startTrackPos.pageIndex); var tr_point = this.drawingObjects.getDrawingDocument().ConvertCoordsToAnotherPage(x, y, pageIndex, this.drawingObjects.startTrackPos.pageIndex);
tr_x = tr_point.X; tr_x = tr_point.X;
tr_y = tr_point.Y; tr_y = tr_point.Y;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment