Различные баги

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

Word/Editor/GraphicObjects/Format/ChartSpacePrototype.js

@@ -297,15 +297,7 @@ CChartSpace.prototype.recalculate = function()
 
         if(this.recalcInfo.recalcTitle)
         {
-            var pos_x, pos_y;
-            pos_x = this.recalcInfo.recalcTitle.x;
-            pos_y = this.recalcInfo.recalcTitle.y;
-            var pos_cx = pos_x +  this.recalcInfo.recalcTitle.extX/2;
-            this.recalculateAxisLabels();
-            this.recalcInfo.recalcTitle.setPosition(pos_cx - this.recalcInfo.recalcTitle.extX/2, pos_y);
-            var posX = this.localTransform.tx + this.posX;
-            var posY = this.localTransform.ty + this.posY;
-            this.recalcInfo.recalcTitle.updatePosition(posX, posY);
+            this.recalculateChartTitleEditMode(true);
             this.recalcInfo.recalcTitle = null;
             this.recalcInfo.bRecalculatedTitle = true;
         }
@@ -609,14 +601,14 @@ CChartSpace.prototype.updateTransformMatrix  = function()
             if(this.chart.plotArea.catAx)
             {
                 if(this.chart.plotArea.catAx.title)
-                    this.chart.plotArea.catAx.title.updatePosition(posX, posY);
+                    this.chart.plotArea.catAx.title.updatePosition(this.posX, this.posY);
                 if(this.chart.plotArea.catAx.labels)
                     this.chart.plotArea.catAx.labels.updatePosition(posX, posY);
             }
             if(this.chart.plotArea.valAx)
             {
                 if(this.chart.plotArea.valAx.title)
-                    this.chart.plotArea.valAx.title.updatePosition(posX, posY);
+                    this.chart.plotArea.valAx.title.updatePosition(this.posX, this.posY);
                 if(this.chart.plotArea.valAx.labels)
                     this.chart.plotArea.valAx.labels.updatePosition(posX, posY);
             }
@@ -624,7 +616,7 @@ CChartSpace.prototype.updateTransformMatrix  = function()
         }
         if(this.chart.title)
         {
-            this.chart.title.updatePosition(posX, posY);
+            this.chart.title.updatePosition(this.posX, this.posY);
         }
         if(this.chart.legend)
         {

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -149,9 +149,9 @@ CGraphicObjects.prototype =
             ret.setBDeleted(false);
             ret.setStyle(2);
             ret.setSpPr(new CSpPr());
-            ret.spPr.setParent(Image);
+            ret.spPr.setParent(ret);
             ret.spPr.setXfrm(new CXfrm());
-            ret.spPr.xfrm.setParent(Image.spPr);
+            ret.spPr.xfrm.setParent(ret.spPr);
             ret.spPr.xfrm.setOffX(0);
             ret.spPr.xfrm.setOffY(0);
             ret.spPr.xfrm.setExtX(152);
@@ -576,6 +576,7 @@ CGraphicObjects.prototype =
                 if(parent_group.spTree[i] === this.selection.groupSelection.selectedObjects[0])
                 {
                     parent_group.removeFromSpTreeByPos(i);
+                    chart_space.setGroup(parent_group);
                     chart_space.spPr.xfrm.setOffX(this.selection.groupSelection.selectedObjects[0].spPr.xfrm.offX);
                     chart_space.spPr.xfrm.setOffY(this.selection.groupSelection.selectedObjects[0].spPr.xfrm.offY);
                     parent_group.addToSpTree(i, chart_space);