Commit 4481eb0a authored by konovalovsergey's avatar konovalovsergey

insertDocumentUrlsData load arraybuffer

parent a4858e08
......@@ -3091,6 +3091,7 @@
window["AscCommon"].prepareUrl = prepareUrl;
window["AscCommon"].getUserColorById = getUserColorById;
window["AscCommon"].isNullOrEmptyString = isNullOrEmptyString;
window["AscCommon"].initStreamFromResponse = initStreamFromResponse;
window["AscCommon"].DocumentUrls = DocumentUrls;
window["AscCommon"].CLock = CLock;
......
......@@ -2541,14 +2541,15 @@ background-repeat: no-repeat;\
t.insertDocumentUrlsData.imageMap = url;
AscCommon.loadFileContent(url['output.bin'], function(httpRequest)
{
if (null === httpRequest)
var stream;
if (null === httpRequest || !(stream = AscCommon.initStreamFromResponse(httpRequest)))
{
t.endInsertDocumentUrls();
t.sendEvent("asc_onError", c_oAscError.ID.MailMergeLoadFile, c_oAscError.Level.NoCritical);
return;
}
t.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.Internal, 'docData;' + httpRequest.responseText, undefined, undefined, true);
});
t.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.Internal, undefined, undefined, undefined, true, stream);
}, "arraybuffer");
}
else
{
......
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