Commit e85bc801 authored by GoshaZotov's avatar GoshaZotov

fix bug 33535

parent cfd36293
...@@ -913,6 +913,7 @@ ...@@ -913,6 +913,7 @@
_pasteFromBinaryWord: function(worksheet, base64, isIntoShape, isCellEditMode) _pasteFromBinaryWord: function(worksheet, base64, isIntoShape, isCellEditMode)
{ {
var res = true; var res = true;
var t = this;
var pasteData = this.ReadFromBinaryWord(base64, worksheet); var pasteData = this.ReadFromBinaryWord(base64, worksheet);
if(isCellEditMode) if(isCellEditMode)
...@@ -922,7 +923,15 @@ ...@@ -922,7 +923,15 @@
//insert binary from word into SHAPE //insert binary from word into SHAPE
else if(isIntoShape) else if(isIntoShape)
{ {
this._insertBinaryIntoShapeContent(worksheet, pasteData.content, true); var callback = function(isSuccess)
{
if(isSuccess)
{
t._insertBinaryIntoShapeContent(worksheet, pasteData.content, true);
}
};
worksheet.objectRender.controller.checkSelectedObjectsAndCallback2(callback);
} }
else else
{ {
...@@ -960,8 +969,15 @@ ...@@ -960,8 +969,15 @@
} }
else if(isIntoShape) else if(isIntoShape)
{ {
this._insertBinaryIntoShapeContent(worksheet, docContent) var callback = function(isSuccess)
{
if(isSuccess)
{
t._insertBinaryIntoShapeContent(worksheet, docContent)
}
};
worksheet.objectRender.controller.checkSelectedObjectsAndCallback2(callback);
return true; return true;
} }
else else
...@@ -1084,10 +1100,11 @@ ...@@ -1084,10 +1100,11 @@
_insertBinaryIntoShapeContent: function(worksheet, content, isConvertToPPTX) _insertBinaryIntoShapeContent: function(worksheet, content, isConvertToPPTX)
{ {
if(!content || !content.length)
if(!content || !content.length){ {
return; return;
} }
History.Create_NewPoint(); History.Create_NewPoint();
History.StartTransaction(); History.StartTransaction();
......
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