Исправлен баг с созданием результирующего документа во время слияния (баг 30847).

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

Word/Editor/Document.js

@@ -702,9 +702,12 @@ function CDocument(DrawingDocument)
     this.CollaborativeEditing = (("undefined" !== typeof(CWordCollaborativeEditing) && CollaborativeEditing instanceof CWordCollaborativeEditing) ? CollaborativeEditing : null);
     this.Api                  = editor;
     //------------------------------------------------------------------------
-    this.History.Document = this;
-    if (this.CollaborativeEditing)
-        this.CollaborativeEditing.m_oLogicDocument = this;
+    if (DrawingDocument)
+    {
+        this.History.Document = this;
+        if (this.CollaborativeEditing)
+            this.CollaborativeEditing.m_oLogicDocument = this;
+    }
     //------------------------------------------------------------------------
 
     this.Id = this.IdCounter.Get_NewId();
@@ -1000,6 +1003,7 @@ CDocument.prototype =
                 this.private_ProcessTemplateReplacement(TemplateReplacementData);
             }
         }
+        this.Set_FastCollaborativeEditing(true);
     },
     
     Add_TestDocument : function()