git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48950 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -1643,12 +1643,16 @@ CGroupShape.prototype =
         return ShapeToImageConverter(this, this.pageIndex).ImageUrl;
     },
 
-    readFromBinaryForCopyPaste: function(r, group, drawingObjects)
+    readFromBinaryForCopyPaste: function(r, group, drawingObjects, x, y)
     {
 
         this.group = group;
         this.drawingObjects = drawingObjects;
         this.spPr.Read_FromBinary2(r);
+        if(isRealNumber(x) && isRealNumber(y))
+        {
+            this.setPosition(x, y);
+        }
         var l = r.GetLong();
         for(var i = 0; i < l;++i)
         {

Excel/model/DrawingObjects/Format/Image.js

@@ -1067,12 +1067,16 @@ CImageShape.prototype =
 
     },
 
-    readFromBinaryForCopyPaste: function(r, group, drawingObjects)
+    readFromBinaryForCopyPaste: function(r, group, drawingObjects, x, y)
     {
         this.group = group;
         this.drawingObjects = drawingObjects;
         this.blipFill.Read_FromBinary2(r);
         this.spPr.Read_FromBinary2(r);
+        if(isRealNumber(x) && isRealNumber(y))
+        {
+            this.setPosition(x, y);
+        }
 
         if(!isRealObject(group))
         {

Excel/model/DrawingObjects/Format/Shape.js

@@ -2839,11 +2839,15 @@ CShape.prototype =
         return  "TeamLabShape" + w.pos + ";" + w.GetBase64Memory();
     },
 
-    readFromBinaryForCopyPaste: function(r, group, drawingObjects)
+    readFromBinaryForCopyPaste: function(r, group, drawingObjects, x, y)
     {
         this.group = group;
         this.drawingObjects = drawingObjects;
         this.spPr.Read_FromBinary2(r);
+        if(isRealNumber(x) && isRealNumber(y))
+        {
+            this.setPosition(x, y);
+        }
         if(r.GetBool())
         {
             this.style = new CShapeStyle();