новый сборщик. полная реализация

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

Common/Native/native.js

@@ -321,6 +321,7 @@ function NativeApplyChangesData(data, isFull)
     }
     else
     {
+		_api.asc_nativeApplyChanges2(data, isFull);
     }
 }
 

Excel/api.js

@@ -3472,7 +3472,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
             var oBinaryFileWriter = new Asc.BinaryFileWriter(this.wbModel);
             oBinaryFileWriter.Write2();
 
-            var _header = c_oSerFormat.Signature + ";v" + c_oSerFormat.Version + ";" + oBinaryFileWriter.Memory.GetCurPosition() + ";";
+            var _header = oBinaryFileWriter.WriteFileHeader(oBinaryFileWriter.Memory.GetCurPosition());
             window["native"]["Save_End"](_header, oBinaryFileWriter.Memory.GetCurPosition());
 
             return oBinaryFileWriter.Memory.ImData.data;

Excel/model/Serialize.js

@@ -6713,6 +6713,8 @@
         this.ReadData = function(data, wb)
         {
             History.TurnOff();
+
+            this.stream = new FT_Stream2(data, data.length);
             this.ReadFile(wb);
 
             ReadDefCellStyles(wb, wb.CellStyles.DefaultStyles);

Excel/model/Workbook.js

@@ -1983,10 +1983,11 @@ Workbook.prototype.DeserializeHistoryNative = function(oRedoObjectParam, data, i
 					break;
 			}
 			
-			var _len = Loader.Reader.GetLong();
+			var _len = stream.GetLong();
 
 			_pos += 4;
 			stream.size = _pos + _len;
+            stream.Seek(_pos);
 			stream.Seek2(_pos);
 			
 			var item = new UndoRedoItemSerializable();