Commit 272f5ee8 authored by GoshaZotov's avatar GoshaZotov

fix bug 34193

parent 5a32ed38
...@@ -6165,9 +6165,10 @@ function BinaryFileReader(doc, openParams) ...@@ -6165,9 +6165,10 @@ function BinaryFileReader(doc, openParams)
}; };
this.ReadFromString = function (sBase64, isCopyPaste) { this.ReadFromString = function (sBase64, isCopyPaste) {
//надо сбросить то, что остался после открытия документа //надо сбросить то, что остался после открытия документа
var api = this.Document.DrawingDocument.m_oWordControl.m_oApi; var api = isCopyPaste ? this.Document.DrawingDocument.m_oWordControl.m_oApi : null;
var insertDocumentUrlsData = api ? api.insertDocumentUrlsData : null;
pptx_content_loader.Clear(); pptx_content_loader.Clear();
pptx_content_loader.Start_UseFullUrl(api.insertDocumentUrlsData); pptx_content_loader.Start_UseFullUrl(insertDocumentUrlsData);
this.stream = this.getbase64DecodedData(sBase64); this.stream = this.getbase64DecodedData(sBase64);
this.ReadMainTable(); this.ReadMainTable();
var oReadResult = this.oReadResult; var oReadResult = this.oReadResult;
...@@ -6452,10 +6453,13 @@ function BinaryFileReader(doc, openParams) ...@@ -6452,10 +6453,13 @@ function BinaryFileReader(doc, openParams)
} }
} }
//посылаем событие о добавлении комментариев //посылаем событие о добавлении комментариев
if(api)
{
for(var i in oCommentsNewId) for(var i in oCommentsNewId)
{ {
var oNewComment = oCommentsNewId[i]; var oNewComment = oCommentsNewId[i];
this.Document.DrawingDocument.m_oWordControl.m_oApi.sync_AddComment( oNewComment.Id, oNewComment.Data ); api.sync_AddComment( oNewComment.Id, oNewComment.Data );
}
} }
for (var i = 0, length = this.oReadResult.aTableCorrect.length; i < length; ++i) { for (var i = 0, length = this.oReadResult.aTableCorrect.length; i < length; ++i) {
var table = this.oReadResult.aTableCorrect[i]; var table = this.oReadResult.aTableCorrect[i];
......
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