Commit 78f8b5a7 authored by GoshaZotov's avatar GoshaZotov

+previous

parent fd497b05
...@@ -290,12 +290,12 @@ ...@@ -290,12 +290,12 @@
} }
}, },
pasteData: function(ws, _format, data1, data2, text_data) pasteData: function(ws, _format, data1, data2, text_data, bIsSpecialPaste)
{ {
var t = this; var t = this;
t.pasteProcessor.clean(); t.pasteProcessor.clean();
if(null === this.specialPasteProps) if(!bIsSpecialPaste)
{ {
window['AscCommon'].g_clipboardBase.specialPasteData.activeRange = ws.model.selectionRange.clone(ws.model); window['AscCommon'].g_clipboardBase.specialPasteData.activeRange = ws.model.selectionRange.clone(ws.model);
window['AscCommon'].g_clipboardBase.specialPasteUndoData.images = []; window['AscCommon'].g_clipboardBase.specialPasteUndoData.images = [];
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
} }
} }
if(null === this.specialPasteProps) if(!bIsSpecialPaste)
{ {
window['AscCommon'].g_clipboardBase.specialPasteData._format = _format; window['AscCommon'].g_clipboardBase.specialPasteData._format = _format;
window['AscCommon'].g_clipboardBase.specialPasteData.data1 = data1; window['AscCommon'].g_clipboardBase.specialPasteData.data1 = data1;
......
...@@ -8798,7 +8798,7 @@ ...@@ -8798,7 +8798,7 @@
api.wb.clipboard.specialPasteProps = tempProps; api.wb.clipboard.specialPasteProps = tempProps;
var specialPasteData = window['AscCommon'].g_clipboardBase.specialPasteData; var specialPasteData = window['AscCommon'].g_clipboardBase.specialPasteData;
api.wb.clipboard.pasteData(this, specialPasteData._format, specialPasteData.data1, specialPasteData.data2, specialPasteData.text_data); api.wb.clipboard.pasteData(this, specialPasteData._format, specialPasteData.data1, specialPasteData.data2, specialPasteData.text_data, true);
} }
}; };
......
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