changes repair. generate styles bug

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

Common/Native/native.js

@@ -233,8 +233,10 @@ var Asc = window["Asc"];
 
 function NativeOpenFile()
 {
-    var doc_bin = window.native.GetFileString(g_file_path);
-    if (NATIVE_DOCUMENT_TYPE == "presentation" || NATIVE_DOCUMENT_TYPE == "document")
+    var doc_bin = window.native.GetFileString(window.native.GetFilePath());
+    window.NATIVE_DOCUMENT_TYPE = window.native.GetEditorType();
+    
+    if (window.NATIVE_DOCUMENT_TYPE == "presentation" || window.NATIVE_DOCUMENT_TYPE == "document")
     {
         _api = new window["asc_docs_api"]("");       
         _api.asc_nativeOpenFile(doc_bin);
@@ -275,7 +277,7 @@ function NativeCalculateFile()
 
 function NativeApplyChanges()
 {
-    if (NATIVE_DOCUMENT_TYPE == "presentation" || NATIVE_DOCUMENT_TYPE == "document")
+    if (window.NATIVE_DOCUMENT_TYPE == "presentation" || window.NATIVE_DOCUMENT_TYPE == "document")
     {
         var __changes = [];
         var _count_main = window.native.GetCountChanges();

Word/Drawing/DrawingDocument.js

@@ -4675,6 +4675,11 @@ function CDrawingDocument()
         // regenerate styles
         if (null == this.m_oWordControl.m_oApi._gui_styles)
         {
+            if (window["NATIVE_EDITOR_ENJINE"] === true)
+            {
+                if (!this.m_oWordControl.m_oApi.asc_checkNeedCallback("asc_onInitEditorStyles"))
+                    return;
+            }
             var StylesPainter = new CStylesPainter();
             StylesPainter.GenerateStyles(this.m_oWordControl.m_oApi, this.m_oWordControl.m_oLogicDocument.Get_Styles().Style);
         }

Word/Editor/CollaborativeEditing.js

@@ -663,8 +663,14 @@ function CCollaborativeEditing()
         g_oIdCounter.Set_Load( true );
 
         // Применяем изменения, пока они есть
+        var _index = 0;
         while ( this.m_aChanges.length > 0 )
         {
+            if (window["NATIVE_EDITOR_ENJINE"] === true && window["native"]["SetCurrentChangeFile"])
+            {
+                window["native"]["SetCurrentChangeFile"](_index++);
+            }
+        
             var Changes = this.m_aChanges[0];
             Changes.Apply_Data();
 

Word/api.js

@@ -6168,6 +6168,12 @@ asc_docs_api.prototype.asyncFontsDocumentStartLoaded = function()
 };
 asc_docs_api.prototype.GenerateStyles = function()
 {
+    if (window["NATIVE_EDITOR_ENJINE"] === true)
+    {
+        if (!this.asc_checkNeedCallback("asc_onInitEditorStyles"))
+            return;
+    }
+
     var StylesPainter = new CStylesPainter();
     if (null == this.LoadedObject && null != this.WordControl.m_oLogicDocument)
     {