Не применялись некоторые изменения при совместном редактировании в...

Не применялись некоторые изменения при совместном редактировании в презентациях. Исправил сдвиг таблиц в презентациях.

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

Excel/view/DrawingObjectsController.js

@@ -24,7 +24,7 @@ function CContentChangesElement(Type, Pos, Count, Data)
 
             this.m_pData.Data.UseArray = true;
             this.m_pData.Data.PosArray = this.m_aPositions;
-
+            Binary_Writer.WriteString2(this.m_pData.Class.Get_Id());
             this.m_pData.Class.Save_Changes( this.m_pData.Data, Binary_Writer );
 
             var Binary_Len = Binary_Writer.GetCurPosition() - Binary_Pos;

PowerPoint/Editor/CollaborativeEditing.js

@@ -562,7 +562,7 @@ function CCollaborativeChanges()
     this.Internal_Save_Data = function(Class, Data, Binary)
     {
         var Writer = History.BinaryWriter;
-        var Pos = Binary.Pos
+        var Pos = Binary.Pos;
         var Len = Binary.Len;
 
         if ( "undefined" != typeof(Class.Save_Changes2) )

PowerPoint/Editor/Format/GraphicFrame.js

@@ -320,6 +320,8 @@ CGraphicFrame.prototype =
             {
                 if(this.graphicObject)
                 {
+                    this.graphicObject.Set_PositionH(c_oAscHAnchor.Page, false, 0);
+                    this.graphicObject.Set_PositionV(c_oAscVAnchor.Page, false, 0);
                     this.graphicObject.Parent = this;
                     this.graphicObject.Reset(0, 0, this.spPr.xfrm.extX, 10000, 0);
                     this.graphicObject.Recalculate_Page(0);
@@ -748,6 +750,7 @@ CGraphicFrame.prototype =
     {
         this.recalcInfo.recalculateSizes = true;
         this.recalcInfo.recalculateTransform = true;
+        editor.WordControl.m_oLogicDocument.Document_UpdateRulersState();
     },
 
 

PowerPoint/Editor/Format/Presentation.js

@@ -809,7 +809,7 @@ CPresentation.prototype =
 
         this.Document_UpdateInterfaceState();
         this.Document_UpdateSelectionState();
-        this.Document_UpdateRulersState();
+       // this.Document_UpdateRulersState();
         editor.WordControl.OnUpdateOverlay();
     },
 
@@ -959,7 +959,7 @@ CPresentation.prototype =
     },
 
 
-    Create_TableGraphicFrame : function(Cols, Rows, Parent, StyleId, Width, Height, PosX, PosY)
+    Create_TableGraphicFrame : function(Cols, Rows, Parent, StyleId, Width, Height, PosX, PosY, bInline)
     {
         var W;
         if(isRealNumber(Width))
@@ -981,6 +981,11 @@ CPresentation.prototype =
             X = 0;
             Y = 0;
         }
+        var Inline = false;
+        if(isRealBool(bInline))
+        {
+            Inline = bInline;
+        }
         var Grid = [];
 
         for ( var Index = 0; Index < Cols; Index++ )
@@ -1004,7 +1009,12 @@ CPresentation.prototype =
         graphic_frame.spPr.xfrm.setExtY(7.478268771701388 * Rows);
         graphic_frame.setNvSpPr(new UniNvPr());
 
-        var table = new CTable(this.DrawingDocument, graphic_frame, true, 0, X, Y, W, 100000, Rows, Cols, Grid, true);
+        var table = new CTable(this.DrawingDocument, graphic_frame, Inline, 0, X, Y, W, 100000, Rows, Cols, Grid, true);
+        if(!Inline)
+        {
+            table.Set_PositionH(c_oAscHAnchor.Page, false, 0);
+            table.Set_PositionV(c_oAscVAnchor.Page, false, 0);
+        }
         table.Set_TableLayout(tbllayout_Fixed);
         if(typeof StyleId === "string")
         {
@@ -2632,7 +2642,7 @@ CPresentation.prototype =
             {
                 if(this.TableStylesIdMap[key])
                 {
-                    this.TablesForInterface[index] = this.Create_TableGraphicFrame(5, 5, Slide, key, W, H, _x_mar, _y_mar);
+                    this.TablesForInterface[index] = this.Create_TableGraphicFrame(5, 5, Slide, key, W, H, _x_mar, _y_mar, true);
                     this.TablesForInterface[index].setBDeleted(true);
                     index++;
                 }

Word/Editor/Table.js

@@ -15535,7 +15535,7 @@ CTable.prototype =
             var OffsetCorrection_Left  = 0;
             var OffsetCorrection_Right = 0;
 
-            if ( this.Content.length > 0 && this.Content[0].Get_CellsCount() > 0 )
+            if ( this.Content.length > 0 && this.Content[0].Get_CellsCount() > 0  && !(this.bPresentation === true))
             {
                 var FirstRow   = this.Content[0];
                 var Cell_Left  = FirstRow.Get_Cell( 0 );