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

Bug 24216 - Заблокировать возможность изменять границы обтекания у inline автофигуры

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56639 954022d7-b5bf-4e40-9824-e11837661b57
parent d4f759ec
...@@ -841,7 +841,7 @@ DrawingObjectsController.prototype = ...@@ -841,7 +841,7 @@ DrawingObjectsController.prototype =
if(this.selectedObjects.length === 1 && this.selectedObjects[0].parent && !this.selectedObjects[0].parent.Is_Inline()) if(this.selectedObjects.length === 1 && this.selectedObjects[0].parent && !this.selectedObjects[0].parent.Is_Inline())
{ {
var anchor_pos; var anchor_pos;
if(this.arrTrackObjects.length === 1) if(this.arrTrackObjects.length === 1 && !(this.arrTrackObjects[0] instanceof TrackPointWrapPointWrapPolygon || this.arrTrackObjects[0] instanceof TrackNewPointWrapPolygon))
{ {
var page_index = isRealNumber(this.arrTrackObjects[0].pageIndex) ? this.arrTrackObjects[0].pageIndex : (isRealNumber(this.arrTrackObjects[0].selectStartPage) ? this.arrTrackObjects[0].selectStartPage : 0); var page_index = isRealNumber(this.arrTrackObjects[0].pageIndex) ? this.arrTrackObjects[0].pageIndex : (isRealNumber(this.arrTrackObjects[0].selectStartPage) ? this.arrTrackObjects[0].selectStartPage : 0);
if(page_index === pageIndex) if(page_index === pageIndex)
......
...@@ -2209,9 +2209,8 @@ CGraphicObjects.prototype = ...@@ -2209,9 +2209,8 @@ CGraphicObjects.prototype =
canChangeWrapPolygon: function() canChangeWrapPolygon: function()
{ {
return !this.selection.groupSelection && !this.selection.textSelection && !this.selection.chartSelection return !this.selection.groupSelection && !this.selection.textSelection && !this.selection.chartSelection
&& this.selectedObjects.length === 1 && this.selectedObjects[0].canChangeWrapPolygon && this.selectedObjects[0].canChangeWrapPolygon(); && this.selectedObjects.length === 1 && this.selectedObjects[0].canChangeWrapPolygon && this.selectedObjects[0].canChangeWrapPolygon() && !this.selectedObjects[0].parent.Is_Inline();
}, },
startChangeWrapPolygon: function() startChangeWrapPolygon: function()
......
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