выход из режима редактирования текста при применении формы текстарта

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

Common/Drawings/CommonController.js

@@ -2035,6 +2035,7 @@ DrawingObjectsController.prototype =
                 {
                     objects_by_type.groups[i].applyTextArtForm(oPreset);
                 }
+                this.resetTextSelection();
             }
         }
         var oApi = this.getEditorApi();
@@ -4224,6 +4225,27 @@ DrawingObjectsController.prototype =
         }
     },
 
+    resetTextSelection: function()
+    {
+        var oContent = this.getTargetDocContent();
+        if(oContent)
+        {
+            oContent.Selection_Remove();
+            if(this.selection.groupSelection)
+            {
+                this.selection.groupSelection.selection.textSelection = null;
+            }
+            if(this.selection.textSelection)
+            {
+                this.selection.textSelection = null;
+            }
+            if(this.selection.chartSelection)
+            {
+                this.selection.chartSelection.selection.textSelection = null
+            }
+        }
+    },
+
     selectAll: function()
     {
         var i;
@@ -6214,6 +6236,22 @@ DrawingObjectsController.prototype =
                 }
             }
             this.checkSelectedObjectsAndCallback(this.setGraphicObjectPropsCallBack, [props], true, historydescription_Spreadsheet_SetGraphicObjectsProps);
+            var oApplyProps = null;
+            if(props)
+            {
+                if(props.ShapeProperties)
+                {
+                    oApplyProps = props.ShapeProperties;
+                }
+                else
+                {
+                    oApplyProps = props;
+                }
+            }
+            if(oApplyProps &&  oApplyProps.textArtProperties && typeof oApplyProps.textArtProperties.asc_getForm() === "string")
+            {
+                this.updateSelectionState();
+            }
         }
         else
         {

PowerPoint/Editor/Format/Presentation.js

@@ -1396,8 +1396,15 @@ CPresentation.prototype =
 
     ShapeApply: function(shapeProps)
     {
+        if(this.Slides[this.CurPage])
+        {
+            this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.applyDrawingProps, [shapeProps], false, historydescription_Presentation_SetShapeProps);
+            if(shapeProps.textArtProperties && typeof shapeProps.textArtProperties.asc_getForm() === "string")
+            {
+                this
+            }
+        }
 
-        this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(this.Slides[this.CurPage].graphicObjects.applyDrawingProps, [shapeProps], false, historydescription_Presentation_SetShapeProps);
         this.Document_UpdateInterfaceState();
     },
 

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -361,6 +361,8 @@ CGraphicObjects.prototype =
         return ret;
     },
 
+    resetTextSelection: DrawingObjectsController.prototype.resetTextSelection,
+
     setProps: function(oProps)
     {
         var oApplyProps, i;
@@ -388,6 +390,10 @@ CGraphicObjects.prototype =
             }
         }
         this.document.Recalculate();
+        if(oApplyProps.textArtProperties && typeof oApplyProps.textArtProperties.asc_getForm() === "string")
+        {
+            this.document.Document_UpdateSelectionState();
+        }
         oApplyProps && (isRealNumber(oApplyProps.verticalTextAlign) || isRealNumber(oApplyProps.vert)) && this.document.Document_UpdateSelectionState();
     },