Commit 407c920f authored by GoshaZotov's avatar GoshaZotov

copy from shape through html(excel)

parent bc48a1bc
...@@ -198,12 +198,7 @@ ...@@ -198,12 +198,7 @@
//use binary strings //use binary strings
if(copyPasteUseBinary) if(copyPasteUseBinary)
{ {
if(isIntoShape) if(!isIntoShape)
{
this.lStorage = {};
this.lStorage.htmlInShape = text;
}
else
{ {
sBase64 = this.getBinaryForCopy(worksheet); sBase64 = this.getBinaryForCopy(worksheet);
$(container.children[0]).addClass(sBase64); $(container.children[0]).addClass(sBase64);
...@@ -216,6 +211,14 @@ ...@@ -216,6 +211,14 @@
getBinaryForCopy: function(worksheet) getBinaryForCopy: function(worksheet)
{ {
var objectRender = worksheet.objectRender;
var isIntoShape = objectRender.controller.getTargetDocContent();
if(isIntoShape)
{
return null;
}
pptx_content_writer.Start_UseFullUrl(); pptx_content_writer.Start_UseFullUrl();
//TODO стоит убрать заглушку при правке бага с activeRange //TODO стоит убрать заглушку при правке бага с activeRange
......
...@@ -767,7 +767,7 @@ ...@@ -767,7 +767,7 @@
break; break;
} }
if (_data_format != "") if (_data_format != "" && _data !== null)
{ {
if (_data_format == "text/x-custom") if (_data_format == "text/x-custom")
this.ClosureParams.setData(_data_format, "asc_internalData;" + _data); this.ClosureParams.setData(_data_format, "asc_internalData;" + _data);
......
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