Поправил обновление курсора; добывил вызов обновления позиций подписей для 3d диаграмм

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

Build/deploy/sdk_configs/webpowerpoint.json

@@ -31,6 +31,7 @@
                 "../../Common/SerializeChart.js",
                 "../../Common/Charts/charts.js",
                 "../../Common/Charts/ChartsDrawer.js",
+                "../../Common/Charts/3DTransformation.js",
                 "../../Common/Charts/DrawingArea.js",
                 "../../Common/NumFormat.js",
                 "../../Word/Editor/Serialize2.js",

Build/local/webpowerpoint.json

@@ -31,6 +31,7 @@
                 "../../Common/SerializeChart.js",
                 "../../Common/Charts/charts.js",
                 "../../Common/Charts/ChartsDrawer.js",
+                "../../Common/Charts/3DTransformation.js",
                 "../../Common/Charts/DrawingArea.js",
                 "../../Common/NumFormat.js",
                 "../../Word/Editor/Serialize2.js",

Common/Drawings/CommonController.js

@@ -670,7 +670,7 @@ DrawingObjectsController.prototype =
                     {
                         nPageIndex = this.drawingObjects.num;
                     }
-                    content.Update_CursorType(tx, ty, nPageIndex);
+                    content.Update_CursorType(tx, ty, 0);
                     ret.updated = true;
                 }
                 else if(this.drawingObjects)

Common/Drawings/DrawingObjectsHandlers.js

@@ -266,7 +266,7 @@ function handleGroup(drawing, drawingObjectsController, e, x, y, group, pageInde
                                     {
                                         tx = invert_transform_text.TransformPointX(x, y);
                                         ty = invert_transform_text.TransformPointY(x, y);
-                                        content.Update_CursorType(tx, ty, pageIndex);
+                                        content.Update_CursorType(tx, ty, 0);
                                     }
                                 }
                                 return {objectId: drawing.Get_Id(), cursorType: "text"};
@@ -347,7 +347,7 @@ function handleChart(drawing, drawingObjectsController, e, x, y, group, pageInde
                         {
                             tx = invert_transform_text.TransformPointX(x, y);
                             ty = invert_transform_text.TransformPointY(x, y);
-                            content.Update_CursorType(tx, ty, pageIndex);
+                            content.Update_CursorType(tx, ty, 0);
                         }
                     }
                     return {objectId: drawing.Get_Id(), cursorType: "text", title: title};
@@ -449,7 +449,7 @@ function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex
                         {
                             tx = invert_transform_text.TransformPointX(x, y);
                             ty = invert_transform_text.TransformPointY(x, y);
-                            content.Update_CursorType(tx, ty, pageIndex);
+                            content.Update_CursorType(tx, ty, 0);
                         }
                     }
                     return {objectId: drawing.Get_Id(), cursorType: "text", title: title};

Common/Drawings/Format/Shape.js

@@ -3453,8 +3453,7 @@ CShape.prototype =
         {
             var tx = this.invertTransformText.TransformPointX(x, y);
             var ty = this.invertTransformText.TransformPointY(x, y);
-            var page_num = this.parent instanceof Slide ? this.parent.num : 0;
-            this.txBody.content.Update_CursorType(tx, ty, page_num);
+            this.txBody.content.Update_CursorType(tx, ty, 0);
         }
     },
 

PowerPoint/Editor/Format/ChartSpacePrototype.js

@@ -464,6 +464,7 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateChart();
             this.recalcInfo.recalculateChart = false;
+            this.checkAxisLabelsTransform();
         }
 
 

PowerPoint/index.html

@@ -260,6 +260,7 @@
 
 <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/charts.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/ChartsDrawer.js"></script>
+<script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/3DTransformation.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/DrawingArea.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Common/NumFormat.js"></script>
 <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Serialize2.js"></script>

Word/Editor/GraphicObjects/Format/ChartSpacePrototype.js

@@ -377,6 +377,7 @@ CChartSpace.prototype.recalculate = function()
         {
             this.recalculateChart();
             this.recalcInfo.recalculateChart = false;
+            this.checkAxisLabelsTransform();
         }
 
         for(var i = 0; i < this.recalcInfo.dataLbls.length; ++i)