(1.0.0.14) новый формат изменений (word/powerpoint)

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

PowerPoint/api.js

@@ -5234,7 +5234,6 @@ window["asc_docs_api"].prototype["asc_nativeApplyChanges2"] = function(data, isF
 
     // Применяем изменения, пока они есть
     var _count = Loader.Reader.GetLong();
-    //console.log("count:" + _count);
 
     var _pos = 4;
     for (var i = 0; i < _count; i++)
@@ -5245,14 +5244,13 @@ window["asc_docs_api"].prototype["asc_nativeApplyChanges2"] = function(data, isF
                 break;
         }
 
-        var _id  = Loader.Reader.GetLong();
         var _len = Loader.Reader.GetLong();
-
-        //console.log("change: [" + _id + ", " + _len + "]");
-
-        _pos += 8;
+        _pos += 4;
         stream.size = _pos + _len;
 
+        var _id  = Loader.Reader.GetString2();
+        var _read_pos = Loader.Reader.GetCurPos();
+
         var Type = Loader.Reader.GetLong();
         var Class = null;
 
@@ -5261,9 +5259,10 @@ window["asc_docs_api"].prototype["asc_nativeApplyChanges2"] = function(data, isF
             Class = editor.WordControl.m_oLogicDocument.HdrFtr;
         }
         else
-            Class = g_oTableId.Get_ById( "" + _id );
+            Class = g_oTableId.Get_ById( _id );
 
-        stream.Seek2(_pos);
+        stream.Seek(_read_pos);
+        stream.Seek2(_read_pos);
 
         if ( null != Class )
             Class.Load_Changes( Loader.Reader, Loader.Reader2, _color );

Word/api.js

@@ -7780,7 +7780,7 @@ window["asc_docs_api"].prototype["asc_nativeApplyChanges2"] = function(data, isF
 	
     var stream = new FT_Stream2(data, data.length);
     stream.obj = null;
-    var Loader = { Reader : stream };
+    var Loader = { Reader : stream, Reader2 : null };
     var _color = new CDocumentColor( 191, 255, 199 );
 
     // Применяем изменения, пока они есть