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

Common/Drawings/Format/Shape.js

@@ -1677,6 +1677,12 @@ CShape.prototype =
         this.invertTransformText2 = global_MatrixTransformer.Invert(this.transformText2);
     },
 
+    setWordShape: function(pr)
+    {
+        History.Add(this, {Type: historyitem_ShapeSetWordShape, oldPr: this.bWordShape, newPr: pr});
+        this.bWordShape = pr;
+    },
+
     copy: function (sp) {
         if (!(sp instanceof CShape))
             sp = new CShape();
@@ -2327,6 +2333,9 @@ CShape.prototype =
     {
         this.selected = true;
         this.selectStartPage = pageIndex;
+        var content = this.getDocContent && this.getDocContent();
+        if(content)
+            content.Set_StartPage(pageIndex);
         var selected_objects;
         if (!isRealObject(this.group))
             selected_objects = drawingObjectsController.selectedObjects;

Word/Editor/GraphicObjects/Format/ShapePrototype.js

@@ -430,11 +430,7 @@ CShape.prototype.recalculateTransform =  function()
     this.recalculateLocalTransform(this.localTransform);
 };
 
-CShape.prototype.setWordShape = function(pr)
-{
-    History.Add(this, {Type: historyitem_ShapeSetWordShape, oldPr: this.bWordShape, newPr: pr});
-    this.bWordShape = pr;
-};
+
 
 CShape.prototype.updatePosition = function(x, y)
 {

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -2436,7 +2436,8 @@ CGraphicObjects.prototype =
         var i;
         if(this.selection.textSelection)
         {
-            this.drawingDocument.DrawTrack(TYPE_TRACK_TEXT, this.selection.textSelection.getTransformMatrix(), 0, 0, this.selection.textSelection.extX, this.selection.textSelection.extY, false, this.selection.textSelection.canRotate());
+            if(this.selection.textSelection.selectStartPage === pageIndex)
+                this.drawingDocument.DrawTrack(TYPE_TRACK_TEXT, this.selection.textSelection.getTransformMatrix(), 0, 0, this.selection.textSelection.extX, this.selection.textSelection.extY, false, this.selection.textSelection.canRotate());
         }
         else if(this.selection.groupSelection)
         {
@@ -2480,7 +2481,11 @@ CGraphicObjects.prototype =
             for(i = 0; i < this.selectedObjects.length; ++i)
             {
                 if(this.selectedObjects[i].selectStartPage === pageIndex)
+                {
                     this.drawingDocument.DrawTrack(TYPE_TRACK_SHAPE, this.selectedObjects[i].getTransformMatrix(), 0, 0, this.selectedObjects[i].extX, this.selectedObjects[i].extY, false, this.selectedObjects[i].canRotate());
+              //      this.drawingDocument.AutoShapesTrack.DrawEditWrapPointsPolygon(this.selectedObjects[i].parent.wrappingPolygon.calculatedPoints, new CMatrix());
+                }
+
             }
             if(this.selectedObjects.length === 1 && this.selectedObjects[0].drawAdjustments && this.selectedObjects[0].selectStartPage === pageIndex)
             {

Word/Editor/SerializeCommon.js

@@ -249,7 +249,7 @@ function CPPTXContentLoader()
         var s = this.stream;
 
         var shape = new CShape();
-
+        shape.setWordShape(true);
         shape.setBDeleted(false);
         shape.setParent(this.TempMainObject == null ? this.ParaDrawing : null);
         var _rec_start = s.cur;
@@ -357,6 +357,7 @@ function CPPTXContentLoader()
         var s = this.stream;
 
         var shape = new CShape( );
+        shape.setWordShape(true);
         shape.setParent(this.TempMainObject == null ? this.ParaDrawing : null);
         var _rec_start = s.cur;
         var _end_rec = _rec_start + s.GetULong() + 4;