поправлен баг с отрисовкой бага текста в автофигуре в группе в тексте ы колонтитуле

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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -3591,7 +3591,7 @@ CGraphicObjects.prototype =
                 _selection_objects.push(_new_word_graphic_object);
                 var bounds = _new_word_graphic_object.getBounds();
                 var nearest_pos = this.document.Get_NearestPos(_page_index, _new_group.absOffsetX, _new_group.absOffsetY, true, _new_word_graphic_object);
-                _new_word_graphic_object.Set_XYForAdd(_new_group.absOffsetX, _new_group.absOffsetY);
+                _new_word_graphic_object.Set_XYForAdd(_new_group.absOffsetX, _new_group.absOffsetY, nearest_pos, _page_index);
                 _new_word_graphic_object.Add_ToDocument(nearest_pos, true);
 
 
@@ -3670,7 +3670,7 @@ CGraphicObjects.prototype =
                         cur_child_graphic_object.parent.Measure();
                         cur_child_graphic_object.parent.updatePosition(new_offset_x, new_offset_y);
                         cur_child_graphic_object.parent.calculateOffset();
-                        cur_child_graphic_object.parent.Set_XYForAdd(new_offset_x, new_offset_y);
+                        cur_child_graphic_object.parent.Set_XYForAdd2(new_offset_x, new_offset_y);
                         cur_child_graphic_object.parent.Add_ToDocument2(paragraph);
                         cur_child_graphic_object.parent.calculateSnapArrays();
                     }
@@ -3757,7 +3757,7 @@ CGraphicObjects.prototype =
                         cur_child_graphic_object.parent.Measure();
                         cur_child_graphic_object.parent.updatePosition(new_offset_x, new_offset_y);
                         cur_child_graphic_object.parent.calculateOffset();
-                        cur_child_graphic_object.parent.Set_XYForAdd(new_offset_x, new_offset_y);
+                        cur_child_graphic_object.parent.Set_XYForAdd2(new_offset_x, new_offset_y);
                         cur_child_graphic_object.parent.Add_ToDocument2(paragraph);
                         cur_child_graphic_object.parent.calculateSnapArrays();
                     }

Word/Editor/GraphicObjects/ObjectTypes/ShapeTracks.js

@@ -171,8 +171,8 @@ function MoveTrackShape(originalShape, majorOffsetX, majorOffsetY, bChart)
             {
                 this.originalShape = para_drawing.GraphicObj;
 
-                para_drawing.Set_XYForAdd(this.posX, this.posY);
                 var near_pos = this.originalShape.document.Get_NearestPos(this.pageIndex, this.posX, this.posY);
+                para_drawing.Set_XYForAdd(this.posX, this.posY, near_pos, this.pageIndex);
                 para_drawing.Add_ToDocument(near_pos);
                 this.originalShape.setAbsoluteTransform(this.posX, this.posY, null, null, null, null, null);
                 this.originalShape.calculateTransformMatrix();

Word/Editor/GraphicObjects/ObjectTypes/WordGroupShapes.js

@@ -5462,8 +5462,8 @@ function GroupForResize(originalGroup, parentTrack, numberHandle, majorOffsetX,
             {
                 var para_drawing = this.original.parent.copy();
                 this.original = para_drawing.GraphicObj;
-                para_drawing.Set_XYForAdd(this.x, this.y);
                 var near_pos = this.original.document.Get_NearestPos(this.pageIndex, this.x, this.y);
+                para_drawing.Set_XYForAdd(this.x, this.y, near_pos, this.pageIndex);
                 para_drawing.Add_ToDocument(near_pos, false);
                 this.original.setAbsoluteTransform(this.x, this.y, null, null, null, null, null);
                 this.original.recalculate();

Word/Editor/ParagraphContent.js

@@ -4152,6 +4152,34 @@ ParaDrawing.prototype =
         this.updateCursorTypes();
     },
 
+    Set_XYForAdd2 : function(X, Y)
+    {
+        this.Set_PositionH( c_oAscRelativeFromH.Column, false, 0 );
+        this.Set_PositionV( c_oAscRelativeFromV.Paragraph, false, 0 );
+
+        this.PositionH_Old =
+        {
+            RelativeFrom : this.PositionH.RelativeFrom,
+            Align        : this.PositionH.Align,
+            Value        : this.PositionH.Value
+        };
+
+        this.PositionV_Old =
+        {
+            RelativeFrom : this.PositionV.RelativeFrom,
+            Align        : this.PositionV.Align,
+            Value        : this.PositionV.Value
+        };
+
+        this.PositionH.RelativeFrom = c_oAscRelativeFromH.Page;
+        this.PositionH.Align        = false;
+        this.PositionH.Value        = X;
+
+        this.PositionV.RelativeFrom = c_oAscRelativeFromV.Page;
+        this.PositionV.Align        = false;
+        this.PositionV.Value        = Y;
+    },
+
     calculateAfterChangeTheme: function()
     {
         if(isRealObject(this.GraphicObj) && typeof this.GraphicObj.calculateAfterChangeTheme === "function")