Commit 9d026169 authored by GoshaZotov's avatar GoshaZotov

fix bug 32962

parent 416c60de
...@@ -2188,10 +2188,11 @@ PasteProcessor.prototype = ...@@ -2188,10 +2188,11 @@ PasteProcessor.prototype =
content[i].RecalcInfo.Set_Type_0(pararecalc_0_All); content[i].RecalcInfo.Set_Type_0(pararecalc_0_All);
} }
}, },
ReadFromBinary : function(sBase64) ReadFromBinary : function(sBase64, oDocument)
{ {
var openParams = { checkFileSize: false, charCount: 0, parCount: 0 }; var openParams = { checkFileSize: false, charCount: 0, parCount: 0 };
var oBinaryFileReader = new AscCommonWord.BinaryFileReader(this.oLogicDocument, openParams); var doc = oDocument ? oDocument : this.oLogicDocument;
var oBinaryFileReader = new AscCommonWord.BinaryFileReader(doc, openParams);
var oRes = oBinaryFileReader.ReadFromString(sBase64, true); var oRes = oBinaryFileReader.ReadFromString(sBase64, true);
this.bInBlock = oRes.bInBlock; this.bInBlock = oRes.bInBlock;
return oRes; return oRes;
...@@ -3115,7 +3116,7 @@ PasteProcessor.prototype = ...@@ -3115,7 +3116,7 @@ PasteProcessor.prototype =
this.oDocument = AscFormat.ExecuteNoHistory(tempCDocument , this, []); this.oDocument = AscFormat.ExecuteNoHistory(tempCDocument , this, []);
AscCommon.g_oIdCounter.m_bRead = true; AscCommon.g_oIdCounter.m_bRead = true;
var aContent = AscFormat.ExecuteNoHistory(this.ReadFromBinary, this, [base64FromWord]); var aContent = AscFormat.ExecuteNoHistory(this.ReadFromBinary, this, [base64FromWord, this.oDocument]);
AscCommon.g_oIdCounter.m_bRead = false; AscCommon.g_oIdCounter.m_bRead = false;
//возврщаем обратно переменные и историю, документ которой заменяется при создании CDocument //возврщаем обратно переменные и историю, документ которой заменяется при создании CDocument
this.oDocument = trueDocument; this.oDocument = trueDocument;
......
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