git-svn-id:...

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

Excel/model/DrawingObjects/Format/Format.js

@@ -3809,6 +3809,21 @@ function CXfrm()
     this.rot = null;
 
 
+
+    this.isNotNull = function()
+    {
+        return isRealNumber(this.offX) && isRealNumber(this.offY) && isRealNumber(this.extX) && isRealNumber(this.extY);
+    };
+
+
+    this.isNotNullForGroup = function()
+    {
+        return isRealNumber(this.offX) && isRealNumber(this.offY)
+            && isRealNumber(this.chOffX) && isRealNumber(this.chOffY)
+            && isRealNumber(this.extX) && isRealNumber(this.extY)
+            && isRealNumber(this.chExtX) && isRealNumber(this.chExtY);
+    };
+
     this.Write_ToBinary2 =  function(Writer)
     {
 

Excel/model/DrawingObjects/Format/Image.js

@@ -331,6 +331,8 @@ CImageShape.prototype =
     {
         if(this.recalcInfo.recalculateTransform)
         {
+
+
             this.recalculateTransform();
             this.recalcInfo.recalculateTransform = false;
         }
@@ -355,6 +357,7 @@ CImageShape.prototype =
     recalculateTransform: function()
     {
         var xfrm = this.spPr.xfrm;
+
         if(!isRealObject(this.group))
         {
             this.x = xfrm.offX;