Commit 7b9d86b4 authored by GoshaZotov's avatar GoshaZotov

add checks for copy

parent f0006048
...@@ -313,7 +313,10 @@ ...@@ -313,7 +313,10 @@
_data = wb.cellEditor._getFragmentsText(fragments); _data = wb.cellEditor._getFragmentsText(fragments);
} }
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data) if(null !== _data)
{
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data);
}
} }
else else
{ {
...@@ -333,14 +336,17 @@ ...@@ -333,14 +336,17 @@
{ {
_data = this.copyProcessor.getText(activeRange, ws); _data = this.copyProcessor.getText(activeRange, ws);
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data) if(null !== _data)
{
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Text, _data);
}
} }
//HTML //HTML
if(AscCommon.c_oAscClipboardDataFormat.Html & _formats) if(AscCommon.c_oAscClipboardDataFormat.Html & _formats)
{ {
_data = this.copyProcessor.getHtml(activeRange, ws); _data = this.copyProcessor.getHtml(activeRange, ws);
if(_data !== null) if(null !== _data)
{ {
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Html, _data.html) _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Html, _data.html)
} }
...@@ -364,9 +370,12 @@ ...@@ -364,9 +370,12 @@
} }
} }
if(null !== _data)
{
_clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Internal, _data); _clipboard.pushData(AscCommon.c_oAscClipboardDataFormat.Internal, _data);
} }
} }
}
}, },
pasteData: function(ws, _format, data1, data2, text_data, bIsSpecialPaste) pasteData: function(ws, _format, data1, data2, text_data, bIsSpecialPaste)
......
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