правка бага 18206

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

Word/Editor/GraphicObjects/ObjectTypes/Chart.js

@@ -36,6 +36,7 @@ function CChartAsGroup(parent/*(WordGraphicObject)*/, document, drawingDocument,
 
     this.transform = new CMatrix();
     this.invertTransform = new CMatrix();
+    this.ownTransform = new CMatrix();
     this.group = null;
     this.pageIndex = -1;
 
@@ -429,7 +430,7 @@ CChartAsGroup.prototype =
             global_MatrixTransformer.MultiplyAppend(this.transform, this.group.getTransform());
         }
         this.invertTransform = global_MatrixTransformer.Invert(this.transform);
-
+        this.ownTransform = this.transform.CreateDublicate();
         if(isRealObject(this.chartTitle))
         {
             this.chartTitle.recalculateTransform();

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -5550,6 +5550,27 @@ WordShape.prototype =
             {
                 arr_graphic_objects[i].GraphicObj.recalculate();
                 global_MatrixTransformer.MultiplyAppend(arr_graphic_objects[i].getTransformMatrix(), this.transformText);
+                if(arr_graphic_objects[i] instanceof CChartAsGroup)
+                {
+                    var obj = arr_graphic_objects[i];
+                    if(isRealObject(obj.chartTitle))
+                    {
+                        global_MatrixTransformer.MultiplyAppend(obj.chartTitle.transform, this.transformText);
+                        global_MatrixTransformer.MultiplyAppend(obj.chartTitle.transformText, this.transformText);
+                    }
+
+                    if(isRealObject(obj.hAxisTitle))
+                    {
+                        global_MatrixTransformer.MultiplyAppend(obj.hAxisTitle.transform, this.transformText);
+                        global_MatrixTransformer.MultiplyAppend(obj.hAxisTitle.transformText, this.transformText);
+                    }
+
+                    if(isRealObject(obj.vAxisTitle))
+                    {
+                        global_MatrixTransformer.MultiplyAppend(obj.vAxisTitle.transform, this.transformText);
+                        global_MatrixTransformer.MultiplyAppend(obj.vAxisTitle.transformText, this.transformText);
+                    }
+                }
                 arr_graphic_objects[i].updateCursorTypes();
             }
         }

Word/Editor/ParagraphContent.js

@@ -6235,14 +6235,15 @@ ParaDrawing.prototype =
         var bounds_checker = new  CSlideBoundsChecker();
         bounds_checker.init(Page_Width, Page_Height, Page_Width, Page_Height);
         var temp_transform = this.GraphicObj.transform;
-        if(this.GraphicObj instanceof  WordImage)
+        if(this.GraphicObj instanceof  WordImage || this.GraphicObj instanceof CChartAsGroup)
         {
            this.GraphicObj.transform = this.GraphicObj.ownTransform;
         }
         bounds_checker.transform3(this.GraphicObj.transform);
         bounds_checker.rect(0,0, this.GraphicObj.absExtX, this.GraphicObj.absExtY);
 
-        this.draw(bounds_checker);
+        if(!(this.GraphicObj instanceof CChartAsGroup))
+            this.draw(bounds_checker);
         this.GraphicObj.transform = temp_transform;
 
         bounds_checker.CorrectBounds();