Commit 7b080386 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 32850

parent 17c23234
...@@ -635,10 +635,6 @@ var editor; ...@@ -635,10 +635,6 @@ var editor;
// Отправка стилей // Отправка стилей
this._sendWorkbookStyles(); this._sendWorkbookStyles();
if (this.wb) {
this.wb._initCommentsToSave();
}
if (this.IsSendDocumentLoadCompleate && this.collaborativeEditing) { if (this.IsSendDocumentLoadCompleate && this.collaborativeEditing) {
// Принимаем чужие изменения // Принимаем чужие изменения
this.collaborativeEditing.applyChanges(); this.collaborativeEditing.applyChanges();
...@@ -771,7 +767,6 @@ var editor; ...@@ -771,7 +767,6 @@ var editor;
oAdditionalData["vkey"] = this.documentVKey; oAdditionalData["vkey"] = this.documentVKey;
oAdditionalData["outputformat"] = filetype; oAdditionalData["outputformat"] = filetype;
oAdditionalData["title"] = AscCommon.changeFileExtention(this.documentTitle, AscCommon.getExtentionByFormat(filetype)); oAdditionalData["title"] = AscCommon.changeFileExtention(this.documentTitle, AscCommon.getExtentionByFormat(filetype));
this.wb._initCommentsToSave();
oAdditionalData["savetype"] = AscCommon.c_oAscSaveTypes.CompleteAll; oAdditionalData["savetype"] = AscCommon.c_oAscSaveTypes.CompleteAll;
var t = this; var t = this;
t.fCurCallback = function(incomeObject) { t.fCurCallback = function(incomeObject) {
...@@ -835,7 +830,6 @@ var editor; ...@@ -835,7 +830,6 @@ var editor;
this.handlers.trigger("asc_onAdvancedOptions", new AscCommon.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.CSV, cp), this.advancedOptionsAction); this.handlers.trigger("asc_onAdvancedOptions", new AscCommon.asc_CAdvancedOptions(c_oAscAdvancedOptionsID.CSV, cp), this.advancedOptionsAction);
return; return;
} else { } else {
this.wb._initCommentsToSave();
var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel); var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel);
if (c_oAscFileType.CSV === sFormat) { if (c_oAscFileType.CSV === sFormat) {
if (options.CSVOptions instanceof asc.asc_CCSVAdvancedOptions) { if (options.CSVOptions instanceof asc.asc_CCSVAdvancedOptions) {
...@@ -2256,7 +2250,6 @@ var editor; ...@@ -2256,7 +2250,6 @@ var editor;
// Для вставки диаграмм в Word // Для вставки диаграмм в Word
spreadsheet_api.prototype.asc_getBinaryFileWriter = function() { spreadsheet_api.prototype.asc_getBinaryFileWriter = function() {
this.wb._initCommentsToSave();
return new AscCommonExcel.BinaryFileWriter(this.wbModel); return new AscCommonExcel.BinaryFileWriter(this.wbModel);
}; };
...@@ -3139,12 +3132,10 @@ var editor; ...@@ -3139,12 +3132,10 @@ var editor;
}; };
spreadsheet_api.prototype.asc_nativeGetFile = function() { spreadsheet_api.prototype.asc_nativeGetFile = function() {
this.wb._initCommentsToSave();
var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel); var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel);
return oBinaryFileWriter.Write(); return oBinaryFileWriter.Write();
}; };
spreadsheet_api.prototype.asc_nativeGetFileData = function() { spreadsheet_api.prototype.asc_nativeGetFileData = function() {
this.wb._initCommentsToSave();
var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel); var oBinaryFileWriter = new AscCommonExcel.BinaryFileWriter(this.wbModel);
oBinaryFileWriter.Write2(); oBinaryFileWriter.Write2();
......
...@@ -2407,6 +2407,7 @@ ...@@ -2407,6 +2407,7 @@
{ {
var oThis = this; var oThis = this;
this._prepeareStyles(); this._prepeareStyles();
window["Asc"]["editor"].wb._initCommentsToSave();
this.bs.WriteItemWithLength(function(){oThis.WriteWorksheetsContent();}); this.bs.WriteItemWithLength(function(){oThis.WriteWorksheetsContent();});
}; };
this.WriteWorksheetsContent = function() this.WriteWorksheetsContent = function()
...@@ -2453,11 +2454,9 @@ ...@@ -2453,11 +2454,9 @@
this.bs.WriteItem(c_oSerWorksheetsTypes.MergeCells, function(){oThis.WriteMergeCells(ws);}); this.bs.WriteItem(c_oSerWorksheetsTypes.MergeCells, function(){oThis.WriteMergeCells(ws);});
if ( ws.Drawings && (ws.Drawings.length) ) if (ws.Drawings && (ws.Drawings.length))
this.bs.WriteItem(c_oSerWorksheetsTypes.Drawings, function(){oThis.WriteDrawings(ws.Drawings);}); this.bs.WriteItem(c_oSerWorksheetsTypes.Drawings, function(){oThis.WriteDrawings(ws.Drawings);});
window["Asc"]["editor"].wb._initCommentsToSave();
var aComments = (0 === index) ? this.wb.aComments.concat(ws.aComments) : ws.aComments; var aComments = (0 === index) ? this.wb.aComments.concat(ws.aComments) : ws.aComments;
var aCommentsCoords = (0 === index) ? this.wb.aCommentsCoords.concat(ws.aCommentsCoords) : var aCommentsCoords = (0 === index) ? this.wb.aCommentsCoords.concat(ws.aCommentsCoords) :
ws.aCommentsCoords; ws.aCommentsCoords;
......
...@@ -743,9 +743,6 @@ ...@@ -743,9 +743,6 @@
this.model.handlers.add("setDocumentModified", function(bIsModified) { this.model.handlers.add("setDocumentModified", function(bIsModified) {
self.Api.onUpdateDocumentModified(bIsModified); self.Api.onUpdateDocumentModified(bIsModified);
}); });
this.model.handlers.add("initCommentsToSave", function() {
self._initCommentsToSave();
});
this.model.handlers.add("replaceWorksheet", function(from, to) { this.model.handlers.add("replaceWorksheet", function(from, to) {
self.replaceWorksheet(from, to); self.replaceWorksheet(from, to);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment