Commit c9f3d056 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
parent a6d14824
...@@ -1539,7 +1539,7 @@ ...@@ -1539,7 +1539,7 @@
pasteData = tempWorkbook.aWorksheets[0]; pasteData = tempWorkbook.aWorksheets[0];
if (pasteData) { if (pasteData) {
History.TurnOn(); History.TurnOn();
if(pasteData.Drawings && pasteData.Drawings.length) if(pasteData.Drawings && pasteData.Drawings.length && !(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
t._insertImagesFromBinary(worksheet, pasteData, isIntoShape); t._insertImagesFromBinary(worksheet, pasteData, isIntoShape);
else { else {
var newFonts = {}; var newFonts = {};
...@@ -1734,6 +1734,7 @@ ...@@ -1734,6 +1734,7 @@
aResult = this._parseHtml(pasteFragment, node, worksheet, isText); aResult = this._parseHtml(pasteFragment, node, worksheet, isText);
//insert into document content //insert into document content
if(!(aResult.onlyImages && window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
worksheet.setSelectionInfo('paste',aResult,t); worksheet.setSelectionInfo('paste',aResult,t);
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
......
...@@ -8099,7 +8099,7 @@ ...@@ -8099,7 +8099,7 @@
t._pasteFromLocalBuff(isLargeRange, isLocal, val, bIsUpdate, canChangeColWidth); t._pasteFromLocalBuff(isLargeRange, isLocal, val, bIsUpdate, canChangeColWidth);
var a_drawings = []; var a_drawings = [];
if (val.addImages && val.addImages.length != 0) { if (val.addImages && val.addImages.length != 0 && !(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor)) {
var api = asc["editor"]; var api = asc["editor"];
var aImagesSync = []; var aImagesSync = [];
for (var im = 0; im < val.addImages.length; im++) { for (var im = 0; im < val.addImages.length; im++) {
...@@ -8190,7 +8190,7 @@ ...@@ -8190,7 +8190,7 @@
api.ImageLoader.LoadDocumentImages(aImagesSync, null, t.objectRender.asyncImagesDocumentEndLoaded); api.ImageLoader.LoadDocumentImages(aImagesSync, null, t.objectRender.asyncImagesDocumentEndLoaded);
} }
else if(val.addImagesFromWord && val.addImagesFromWord.length != 0) else if(val.addImagesFromWord && val.addImagesFromWord.length != 0 && !(window["Asc"]["editor"] && window["Asc"]["editor"].isChartEditor))
{ {
window["Asc"]["editor"].wb.clipboard._insertImagesFromBinaryWord(t, val.addImagesFromWord); window["Asc"]["editor"].wb.clipboard._insertImagesFromBinaryWord(t, val.addImagesFromWord);
}; };
......
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