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

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

PowerPoint/Editor/Format/GraphicFrame.js

@@ -2319,6 +2319,8 @@ CGraphicFrame.prototype =
             case historyitem_SetGraphicObject:
             {
                 this.graphicObject = data.newPr;
+                if(this.graphicObject && this.graphicObject.Recalc_CompiledPr)
+                    this.graphicObject.Recalc_CompiledPr();
                 break;
             }
             case historyitem_SetShapeRot:
@@ -2592,6 +2594,8 @@ CGraphicFrame.prototype =
                     if(r.GetBool())
                     {
                         this.graphicObject = g_oTableId.Get_ById(r.GetString2());
+                        if(this.graphicObject && this.graphicObject.Recalc_CompiledPr)
+                            this.graphicObject.Recalc_CompiledPr();
                     }
                     else
                     {

PowerPoint/Editor/Format/Presentation.js

@@ -1785,6 +1785,25 @@ CPresentation.prototype =
 
     Set_TableProps : function(Props)
     {
+        if(Props.CellBorders)
+        {
+            if(Props.CellBorders.Left && Props.CellBorders.Left.Color)
+            {
+                Props.CellBorders.Left.unifill = CreteSolidFillRGB(Props.CellBorders.Left.Color.r, Props.CellBorders.Left.Color.g, Props.CellBorders.Left.Color.b)
+            }
+            if(Props.CellBorders.Top && Props.CellBorders.Top.Color)
+            {
+                Props.CellBorders.Top.unifill = CreteSolidFillRGB(Props.CellBorders.Top.Color.r, Props.CellBorders.Top.Color.g, Props.CellBorders.Top.Color.b)
+            }
+            if(Props.CellBorders.Right && Props.CellBorders.Right.Color)
+            {
+                Props.CellBorders.Right.unifill = CreteSolidFillRGB(Props.CellBorders.Right.Color.r, Props.CellBorders.Right.Color.g, Props.CellBorders.Right.Color.b)
+            }
+            if(Props.CellBorders.Bottom && Props.CellBorders.Bottom.Color)
+            {
+                Props.CellBorders.Bottom.unifill = CreteSolidFillRGB(Props.CellBorders.Bottom.Color.r, Props.CellBorders.Bottom.Color.g, Props.CellBorders.Bottom.Color.b)
+            }
+        }
         this.Slides[this.CurPage].graphicObjects.setTableProps(Props);
         this.Recalculate();
 

PowerPoint/Editor/Format/Table.js

@@ -3037,9 +3037,9 @@ CTable.prototype =
 
         var Table = new CTable( this.DrawingDocument, Parent, this.Inline, 0, 0, 0, 0, 0, 0, 0, TableGrid);
 
+        Table.Set_TableStyle( this.styleIndex );
         // Копируем настройки
         Table.Set_Pr( this.Pr.Copy() );
-        Table.Set_TableStyle( this.styleIndex );
         Table.Set_TableLook( this.TableLook.Copy() );
 
         Table.Rows = this.Rows;
@@ -3058,6 +3058,7 @@ CTable.prototype =
         if ( Table.Content.length > 0 && Table.Content[0].Get_CellsCount() > 0 )
             Table.CurCell = Table.Content[0].Get_Cell(0);
 
+        Table.Recalc_CompiledPr();
         return Table;
     },