git-svn-id:...

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

Excel/model/DrawingObjects/Format/Image.js

@@ -370,19 +370,7 @@ CImageShape.prototype =
             this.recalculateBrush(aImagesSync);
             this.recalcInfo.recalculateBrush = false;
         }
-
-        try
-        {
-            var boundsChecker = new  CSlideBoundsChecker();
-            this.draw(boundsChecker);
-            boundsChecker.CorrectBounds();
-            this.bounds.x = boundsChecker.Bounds.min_x;
-            this.bounds.y = boundsChecker.Bounds.min_y;
-            this.bounds.w = boundsChecker.Bounds.max_x - boundsChecker.Bounds.min_x;
-            this.bounds.h = boundsChecker.Bounds.max_y - boundsChecker.Bounds.min_y;
-        }
-        catch(e)
-        {}
+        this.recalculateBounds();
     },
 
     recalculateBrush: function(aImagesSync)
@@ -464,20 +452,7 @@ CImageShape.prototype =
             global_MatrixTransformer.MultiplyAppend(this.transform, this.group.getTransform());
         }
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-
-
-        try
-        {
-            var boundsChecker = new  CSlideBoundsChecker();
-            this.draw(boundsChecker);
-            boundsChecker.CorrectBounds();
-            this.bounds.x = boundsChecker.Bounds.min_x;
-            this.bounds.y = boundsChecker.Bounds.min_y;
-            this.bounds.w = boundsChecker.Bounds.max_x - boundsChecker.Bounds.min_x;
-            this.bounds.h = boundsChecker.Bounds.max_y - boundsChecker.Bounds.min_y;
-        }
-        catch(e)
-        {}
+        this.recalculateBounds();
     },
 
     calculateTransformTextMatrix: function()
@@ -934,6 +909,22 @@ CImageShape.prototype =
         return false;
     },
 
+    recalculateBounds: function()
+    {
+        try
+        {
+            var boundsChecker = new  CSlideBoundsChecker();
+            this.draw(boundsChecker);
+            boundsChecker.CorrectBounds();
+            this.bounds.x = boundsChecker.Bounds.min_x;
+            this.bounds.y = boundsChecker.Bounds.min_y;
+            this.bounds.w = boundsChecker.Bounds.max_x - boundsChecker.Bounds.min_x;
+            this.bounds.h = boundsChecker.Bounds.max_y - boundsChecker.Bounds.min_y;
+        }
+        catch(e)
+        {}
+    },
+
 
     hitInTextRect: function(x, y)
     {

Excel/model/DrawingObjects/Format/Shape.js

@@ -1228,6 +1228,14 @@ CShape.prototype =
 			}
 		}
 
+        this.calculateContent();
+        this.calculateTransformTextMatrix();
+        this.recalculateBounds();
+    },
+
+
+    recalculateBounds: function()
+    {
         try
         {
             var boundsChecker = new  CSlideBoundsChecker();
@@ -1240,8 +1248,6 @@ CShape.prototype =
         }
         catch(e)
         {}
-        this.calculateContent();
-        this.calculateTransformTextMatrix();
     },
 
     setDrawingDocument: function(drawingDocument)
@@ -2119,18 +2125,7 @@ CShape.prototype =
         }
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
 
-        try
-        {
-            var boundsChecker = new  CSlideBoundsChecker();
-            this.draw(boundsChecker);
-            boundsChecker.CorrectBounds();
-            this.bounds.x = boundsChecker.Bounds.min_x;
-            this.bounds.y = boundsChecker.Bounds.min_y;
-            this.bounds.w = boundsChecker.Bounds.max_x - boundsChecker.Bounds.min_x;
-            this.bounds.h = boundsChecker.Bounds.max_y - boundsChecker.Bounds.min_y;
-        }
-        catch(e)
-        {}
+        this.recalculateBounds();
     },
 
     normalize: function()