Commit 56dd035f authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

отменил вставку графического объекта в шейп

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56412 954022d7-b5bf-4e40-9824-e11837661b57
parent b4b7fed5
...@@ -1657,6 +1657,9 @@ ...@@ -1657,6 +1657,9 @@
targetDocContent.Remove(1, true, true); targetDocContent.Remove(1, true, true);
if(!oPasteProcessor.aContent || !oPasteProcessor.aContent.length)
return;
oPasteProcessor.InsertInPlace(targetDocContent , oPasteProcessor.aContent); oPasteProcessor.InsertInPlace(targetDocContent , oPasteProcessor.aContent);
worksheet.objectRender.controller.startRecalculate(); worksheet.objectRender.controller.startRecalculate();
...@@ -1664,6 +1667,11 @@ ...@@ -1664,6 +1667,11 @@
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
}) })
if(!oPasteProcessor.aContent || !oPasteProcessor.aContent.length)
return false;
else
return true;
}, },
_convertFonts: function(oFonts) _convertFonts: function(oFonts)
...@@ -1693,7 +1701,8 @@ ...@@ -1693,7 +1701,8 @@
var isIntoShape = worksheet.objectRender.controller.getTargetDocContent(); var isIntoShape = worksheet.objectRender.controller.getTargetDocContent();
if(isIntoShape) if(isIntoShape)
{ {
this._pasteInShape(worksheet, node, onlyFromLocalStorage, isIntoShape); var resultPasteInShape = this._pasteInShape(worksheet, node, onlyFromLocalStorage, isIntoShape);
if(resultPasteInShape == true)
return; return;
}; };
......
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