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

Выставление типа обтекания при переходе в режим изменения контура.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57659 954022d7-b5bf-4e40-9824-e11837661b57
parent f6b901c6
...@@ -1010,7 +1010,7 @@ CGraphicObjects.prototype = ...@@ -1010,7 +1010,7 @@ CGraphicObjects.prototype =
handleChartDoubleClick: function(drawing, chart, e, x, y, pageIndex) handleChartDoubleClick: function(drawing, chart, e, x, y, pageIndex)
{ {
if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : drawing, CheckType : changestype_Paragraph_Content} )) if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : drawing.Get_ParentParagraph(), CheckType : changestype_Paragraph_Content} ))
{ {
editor.asc_doubleClickOnChart(this.getChartObject()); editor.asc_doubleClickOnChart(this.getChartObject());
} }
...@@ -2269,6 +2269,15 @@ CGraphicObjects.prototype = ...@@ -2269,6 +2269,15 @@ CGraphicObjects.prototype =
{ {
if(this.canChangeWrapPolygon()) if(this.canChangeWrapPolygon())
{ {
if(this.selectedObjects[0].parent.wrappingType !== WRAPPING_TYPE_THROUGH && this.selectedObjects[0].parent.wrappingType !== WRAPPING_TYPE_TIGHT)
{
if(false === this.document.Document_Is_SelectionLocked(changestype_Drawing_Props, {Type : changestype_2_Element_and_Type , Element : this.selectedObjects[0].parent.Get_ParentParagraph(), CheckType : changestype_Paragraph_Content} ))
{
History.Create_NewPoint();
this.selectedObjects[0].parent.Set_WrappingType(WRAPPING_TYPE_TIGHT);
this.document.Recalculate();
}
}
this.resetInternalSelection(); this.resetInternalSelection();
this.selection.wrapPolygonSelection = this.selectedObjects[0]; this.selection.wrapPolygonSelection = this.selectedObjects[0];
this.updateOverlay(); this.updateOverlay();
......
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