Commit 41d04243 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@48091 954022d7-b5bf-4e40-9824-e11837661b57
parent 6881dceb
...@@ -2052,7 +2052,10 @@ ...@@ -2052,7 +2052,10 @@
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();
curImage.src = cloneImg.image.src; var url = cloneImg.image.src;
if(cloneImg.graphicObject && cloneImg.graphicObject.isImage())
url = cloneImg.graphicObject.getImageUrl()
curImage.src = url;
curImage.width = cloneImg.getWidthFromTo(); curImage.width = cloneImg.getWidthFromTo();
curImage.height = cloneImg.getHeightFromTo(); curImage.height = cloneImg.getHeightFromTo();
curImage.name = image.guid; curImage.name = image.guid;
...@@ -2074,6 +2077,7 @@ ...@@ -2074,6 +2077,7 @@
t.lStorage[nLoc].image = curImage; t.lStorage[nLoc].image = curImage;
t.lStorage[nLoc].fromCol = cloneImg.from.col; t.lStorage[nLoc].fromCol = cloneImg.from.col;
t.lStorage[nLoc].fromRow = cloneImg.from.row; t.lStorage[nLoc].fromRow = cloneImg.from.row;
nLoc++;
isImage = true; isImage = true;
} }
...@@ -2482,7 +2486,7 @@ ...@@ -2482,7 +2486,7 @@
if(images) if(images)
{ {
for (var i = 0; i < images.length; i++) { for (var i = 0; i < images.length; i++) {
if (images[i].flags.selected == true) if ((images[i].graphicObject && images[i].graphicObject.selected == true) || (images[i].flags.selected == true))
{ {
arrImages[n] = i; arrImages[n] = i;
n++; n++;
......
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