git-svn-id:...

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

Excel/model/DrawingObjects/Format/DocumentContent.js

@@ -6732,7 +6732,7 @@ CDocumentContent.prototype =
         History.Add(g_oUndoRedoGraphicObjects, historyitem_DocumentContent_AddItem, null, null, new UndoRedoDataGraphicObjects(this.Get_Id(), new UndoRedoDataDocContentAddItem(Position, NewObject.Get_Id())));
 
         this.Content.splice( Position, 0, NewObject );
-        NewObject.Set_Parent( this );
+        NewObject.setParent( this );
         NewObject.Set_DocumentNext( NextObj );
         NewObject.Set_DocumentPrev( PrevObj );
 

Excel/model/DrawingObjects/Format/Format.js

@@ -1861,6 +1861,7 @@ CGs.prototype =
         this.pos = Reader.GetLong();
     },
 
+
     IsIdentical : function(fill)
     {
         return false;
@@ -1978,6 +1979,19 @@ function GradLin()
 GradLin.prototype =
 {
 
+
+    Write_ToBinary2 : function(Writer)
+    {
+        Writer.WriteLong(this.angle);
+        Writer.WriteBool(this.scale);
+    },
+
+    Read_FromBinary2 : function(Reader)
+    {
+        this.angle = Reader.GetLong();
+        this.scale = Reader.GetBool();
+
+    },
     Get_Id: function()
     {
         return this.Id;
@@ -2072,6 +2086,15 @@ function GradPath()
 }
 GradPath.prototype =
 {
+
+    Write_ToBinary2 : function(Writer)
+    {
+    },
+
+    Read_FromBinary2 : function(Reader)
+    {
+
+    },
     IsIdentical : function(path)
     {
         if (this.path != path.path)
@@ -2109,6 +2132,50 @@ function CGradFill()
 CGradFill.prototype =
 {
 
+
+    Write_ToBinary2 : function(Writer)
+    {
+        Writer.WriteLong(this.type);
+        var colors_count = this.colors.length;
+        Writer.WriteLong(colors_count);
+        for(var i = 0;  i < colors_count; ++i)
+        {
+            this.colors[i].Write_ToBinary2(Writer);
+        }
+        Writer.WriteBool(isRealObject(this.lin));
+        if(isRealObject(this.lin))
+        {
+            this.lin.Write_ToBinary2(Writer);
+        }
+
+        Writer.WriteBool(isRealObject(this.path));
+        if(isRealObject(this.path))
+        {
+            this.path.Write_ToBinary2(Writer);
+        }
+    },
+
+    Read_FromBinary2 : function(Reader)
+    {
+        var colors_count = Reader.GetLong();
+        for(var i = 0; i< colors_count; ++i)
+        {
+            this.colors[i] = new CGs();
+            this.colors[i].Read_FromBinary2(Reader);
+        }
+
+        if(Reader.GetBool())
+        {
+            this.lin = new GradLin();
+            this.lin.Read_FromBinary2(Reader);
+        }
+
+        if(Reader.GetBool())
+        {
+            this.path = new GradPath();
+            this.path.Read_FromBinary2(Reader);
+        }
+    },
     Get_Id: function()
     {
         return this.Id;

Excel/model/DrawingObjects/Format/Paragraph.js

@@ -8463,11 +8463,11 @@ Paragraph.prototype =
             return;
 
         // Если стиль является стилем по умолчанию для параграфа, тогда не надо его записывать.
-        if ( Id != this.Parent.Get_Styles().Get_Default_Paragraph() )
+        /*if ( Id != this.Parent.Get_Styles().Get_Default_Paragraph() )
         {
             History.Add( this, { Type : historyitem_Paragraph_PStyle, Old : Id_old, New : Id } );
             this.Pr.PStyle = Id;
-        }
+        }           */
 
         // Надо пересчитать конечный стиль
         this.CompiledPr.NeedRecalc = true;
@@ -8526,7 +8526,7 @@ Paragraph.prototype =
     {
         if ( undefined != this.Pr.PStyle )
         {
-            History.Add( this, { Type : historyitem_Paragraph_PStyle, Old : this.Pr.PStyle, New : undefined } );
+            //History.Add( this, { Type : historyitem_Paragraph_PStyle, Old : this.Pr.PStyle, New : undefined } );
             this.Pr.PStyle = undefined;
         }
 

Excel/model/DrawingObjects/Format/Shape.js

@@ -2810,6 +2810,8 @@ CShape.prototype =
             case historyitem_AutoShapes_RecalculateAfterInit:
             {
                 this.recalculateTransform();
+                this.calculateContent();
+                this.calculateTransformTextMatrix();
                 this.recalculateBrush();
                 this.recalculatePen();
                 break;

Excel/model/DrawingObjects/Tracks/ResizeTracks.js

@@ -1765,6 +1765,7 @@ function ResizeTrackGroup(originalObject, cardDirection, parentTrack)
 
         History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_GroupRecalculateUndo, null, null,
             new UndoRedoDataGraphicObjects(this.originalObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));
+        this.original.normalize();
         this.original.setPosition(this.x, this.y);
         this.original.setExtents(this.extX, this.extY);
         this.original.setChildExtents(this.extX, this.extY);
@@ -1774,7 +1775,7 @@ function ResizeTrackGroup(originalObject, cardDirection, parentTrack)
             this.childs[i].trackEnd();
         }
         if(this.parentTrack == null)
-            this.original.recalculate();
+            this.original.recalculateTransform();
 
         History.Add(g_oUndoRedoGraphicObjects, historyitem_AutoShapes_GroupRecalculateRedo, null, null,
             new UndoRedoDataGraphicObjects(this.originalObject.Get_Id(), new UndoRedoDataGOSingleProp(null, null)));