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

Excel/model/DrawingObjects/Format/Chart.js

@@ -1807,7 +1807,7 @@ CChartAsGroup.prototype =
 
         this.chart.Write_ToBinary2(w);
         this.spPr.Write_ToBinary2(w);
-        return  "TeamLabChart" + w.pos + ";" + w.GetBase64Memory();
+        return  "TeamLabChartSheets" + w.pos + ";" + w.GetBase64Memory();
     },
 
     readFromBinaryForCopyPaste: function(r, group, drawingObjects, x, y)

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -1670,7 +1670,7 @@ CGroupShape.prototype =
         {
             this.spTree[i].writeToBinaryForCopyPaste(w);
         }
-        return  "TeamLabGroup" + w.pos + ";" + w.GetBase64Memory();
+        return  "TeamLabGroupSheets" + w.pos + ";" + w.GetBase64Memory();
     },
 
 

Excel/model/DrawingObjects/Format/Image.js

@@ -542,9 +542,10 @@ CImageShape.prototype =
             global_MatrixTransformer.ScaleAppend(_transform, 1, -1);
         }
 
-        global_MatrixTransformer.RotateRadAppend(_transform, -this.absRot);
+        if(isRealNumber(this.rot))
+            global_MatrixTransformer.RotateRadAppend(_transform, -this.rot);
 
-        global_MatrixTransformer.TranslateAppend(_transform, this.absOffsetX, this.absOffsetY);
+        global_MatrixTransformer.TranslateAppend(_transform, this.x, this.y);
         global_MatrixTransformer.TranslateAppend(_transform, _horizontal_center, _vertical_center);
 
         if(this.mainGroup !== null)
@@ -563,10 +564,10 @@ CImageShape.prototype =
     {
         var _horizontal_center = this.extX * 0.5;
         var _vertical_enter = this.extY * 0.5;
-        var _sin = Math.sin(this.absRot);
-        var _cos = Math.cos(this.absRot);
-        this.absXLT = -_horizontal_center*_cos + _vertical_enter*_sin +this.absOffsetX + _horizontal_center;
-        this.absYLT = -_horizontal_center*_sin - _vertical_enter*_cos +this.absOffsetY + _vertical_enter;
+        var _sin = Math.sin(isRealNumber(this.rot) ? this.rot : 0);
+        var _cos = Math.cos(isRealNumber(this.rot) ? this.rot : 0);
+        this.absXLT = -_horizontal_center*_cos + _vertical_enter*_sin +this.x + _horizontal_center;
+        this.absYLT = -_horizontal_center*_sin - _vertical_enter*_cos +this.y + _vertical_enter;
     },
 	
 	checkLine: function()
@@ -1249,7 +1250,7 @@ CImageShape.prototype =
             w.WriteDouble(this.drawingObjects.shiftMap[this.Id].y);
         }
         this.spPr.Write_ToBinary2(w);
-        return  "TeamLabImage" + w.pos + ";" + w.GetBase64Memory();
+        return  "TeamLabImageSheets" + w.pos + ";" + w.GetBase64Memory();
 
     },
 

Excel/model/DrawingObjects/Format/Shape.js

@@ -2995,7 +2995,7 @@ CShape.prototype =
         {
             this.txBody.writeToBinaryForCopyPaste(w);
         }
-        return  "TeamLabShape" + w.pos + ";" + w.GetBase64Memory();
+        return  "TeamLabShapeSheets" + w.pos + ";" + w.GetBase64Memory();
     },
 
     readFromBinaryForCopyPaste: function(r, group, drawingObjects, x, y)