Исправлен баг с Undo после добавления автофигуры (баг 20497).

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

Word/Editor/Document.js

@@ -9952,6 +9952,17 @@ CDocument.prototype =
         DocState.CurComment = this.Comments.Get_CurrentId();
 
         var State = null;
+        if ( true === editor.isStartAddShape && docpostype_DrawingObjects === this.CurPos.Type )
+        {
+            DocState.CurPos.Type     = docpostype_Content;
+            DocState.Selection.Start = false;
+            DocState.Selection.Use   = false;
+
+            this.Content[DocState.CurPos.ContentPos].Selection_Remove();
+            State = this.Content[this.CurPos.ContentPos].Get_SelectionState();
+        }
+        else
+        {
             // Работаем с колонтитулом
             if ( docpostype_HdrFtr === this.CurPos.Type )
                 State = this.HdrFtr.Get_SelectionState();
@@ -9989,6 +10000,7 @@ CDocument.prototype =
                 else
                     State = this.Content[this.CurPos.ContentPos].Get_SelectionState();
             }
+        }
 
         State.push( DocState );
 

Word/Editor/DocumentContent.js

@@ -7235,6 +7235,18 @@ CDocumentContent.prototype =
         DocState.CurPage = this.CurPage;
 
         var State = null;
+
+        if ( true === editor.isStartAddShape && docpostype_DrawingObjects === this.CurPos.Type )
+        {
+            DocState.CurPos.Type     = docpostype_Content;
+            DocState.Selection.Start = false;
+            DocState.Selection.Use   = false;
+
+            this.Content[DocState.CurPos.ContentPos].Selection_Remove();
+            State = this.Content[this.CurPos.ContentPos].Get_SelectionState();
+        }
+        else
+        {
             // Работаем с колонтитулом
             if ( docpostype_DrawingObjects === this.CurPos.Type )
                 State = this.LogicDocument.DrawingObjects.getSelectionState();
@@ -7270,6 +7282,7 @@ CDocumentContent.prototype =
                 else
                     State = this.Content[this.CurPos.ContentPos].Get_SelectionState();
             }
+        }
 
         State.push( DocState );
         return State;