Commit 292e581f authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

изменения в copy/paste картинок

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48418 954022d7-b5bf-4e40-9824-e11837661b57
parent 275f5e70
...@@ -2054,9 +2054,14 @@ ...@@ -2054,9 +2054,14 @@
var image = drawings[isSelectedImages[j]]; var image = drawings[isSelectedImages[j]];
var cloneImg = worksheet.objectRender.cloneDrawingObject(image); var cloneImg = worksheet.objectRender.cloneDrawingObject(image);
var curImage = new Image(); var curImage = new Image();
var url = cloneImg.image.src; var url;
if(cloneImg.graphicObject && cloneImg.graphicObject.isImage()) if(cloneImg.graphicObject && cloneImg.graphicObject.isImage())
url = cloneImg.graphicObject.getImageUrl() url = cloneImg.graphicObject.getImageUrl();
else if(cloneImg.graphicObject.isChart() && cloneImg.graphicObject.brush.fill.RasterImageId)
url = cloneImg.graphicObject.brush.fill.RasterImageId;
else
url = cloneImg.image.src;
curImage.src = url; curImage.src = url;
curImage.width = cloneImg.getWidthFromTo(); curImage.width = cloneImg.getWidthFromTo();
curImage.height = cloneImg.getHeightFromTo(); curImage.height = cloneImg.getHeightFromTo();
...@@ -2065,7 +2070,7 @@ ...@@ -2065,7 +2070,7 @@
table.appendChild(curImage); table.appendChild(curImage);
//add image or chart in local buffer //add image or chart in local buffer
if(image.isChart()) if(image.graphicObject.isChart())
{ {
isChart = {}; isChart = {};
isChart.chart = cloneImg.chart; isChart.chart = cloneImg.chart;
......
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