записываем высоту и ширину картинки при копировании

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

Common/Drawings/Format/ChartSpace.js

@@ -1171,6 +1171,8 @@ CChartSpace.prototype =
         copy.setThemeOverride(this.themeOverride);
         copy.setBDeleted(this.bDeleted);
         copy.cachedImage = this.getBase64Img();
+        copy.cachedPixH = this.cachedPixH;
+        copy.cachedPixW = this.cachedPixW;
         return copy;
     },
 

Common/Drawings/Format/GroupShape.js

@@ -243,6 +243,8 @@ CGroupShape.prototype =
         }
         copy.setBDeleted(this.bDeleted);
         copy.cachedImage = this.getBase64Img();
+        copy.cachedPixH = this.cachedPixH;
+        copy.cachedPixW = this.cachedPixW;
         return copy;
     },
 

Common/Drawings/Format/Image.js

@@ -123,6 +123,8 @@ CImageShape.prototype =
         }
         copy.setBDeleted(this.bDeleted);
         copy.cachedImage = this.getBase64Img();
+        copy.cachedPixH = this.cachedPixH;
+        copy.cachedPixW = this.cachedPixW;
         return copy;
     },
 

Common/Drawings/Format/Shape.js

@@ -2008,6 +2008,8 @@ CShape.prototype =
         copy.setWordShape(this.bWordShape);
         copy.setBDeleted(this.bDeleted);
         copy.cachedImage = this.getBase64Img();
+        copy.cachedPixH = this.cachedPixH;
+        copy.cachedPixW = this.cachedPixW;
         return copy;
     },
 
@@ -3488,6 +3490,19 @@ CShape.prototype =
         var img_object = ShapeToImageConverter(this, this.pageIndex);
         if(img_object)
         {
+            if(img_object.ImageNative)
+            {
+                try
+                {
+                    this.cachedPixW = img_object.ImageNative.width;
+                    this.cachedPixH = img_object.ImageNative.height;
+                }
+                catch(e)
+                {
+                    this.cachedPixW = 50;
+                    this.cachedPixH = 50;
+                }
+            }
             return img_object.ImageUrl;
         }
         else

PowerPoint/Editor/Format/GraphicFrame.js

@@ -215,6 +215,8 @@ CGraphicFrame.prototype =
         if(!this.recalcInfo.recalculateTable && !this.recalcInfo.recalculateSizes && !this.recalcInfo.recalculateTransform)
         {
             ret.cachedImage = this.getBase64Img();
+            ret.cachedPixW = this.cachedPixW;
+            ret.cachedPixH = this.cachedPixH;
         }
         return ret;
     },