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

PowerPoint/Editor/Format/Table.js

@@ -21699,7 +21699,7 @@ CTableCell.prototype =
                 else
                 {
                     Writer.WriteBool( false );
-                    Data.New.Write_ToBinary( Writer );
+                    Data.New.writeToBinaryCollaborative( Writer );
                 }
 
                 break;
@@ -21745,7 +21745,7 @@ CTableCell.prototype =
                     else
                     {
                         Writer.WriteBool( false );
-                        Data.New.Write_ToBinary( Writer );
+                        Data.New.writeToBinaryCollaborative( Writer );
                     }
                 }
 
@@ -21882,7 +21882,7 @@ CTableCell.prototype =
                 else
                 {
                     this.Pr.Shd = new CDocumentShd();
-                    this.Pr.Shd.Read_FromBinary( Reader );
+                    this.Pr.Shd.readFromBinaryCollaborative( Reader );
                 }
 
                 this.Recalc_CompiledPr();
@@ -21925,7 +21925,7 @@ CTableCell.prototype =
                     else
                     {
                         this.Pr.TableCellBorders.Left = new CDocumentBorder();
-                        this.Pr.TableCellBorders.Left.Read_FromBinary( Reader );
+                        this.Pr.TableCellBorders.Left.readFromBinaryCollaborative( Reader );
                     }
                 }
 
@@ -21953,7 +21953,7 @@ CTableCell.prototype =
                     else
                     {
                         this.Pr.TableCellBorders.Right = new CDocumentBorder();
-                        this.Pr.TableCellBorders.Right.Read_FromBinary( Reader );
+                        this.Pr.TableCellBorders.Right.readFromBinaryCollaborative( Reader );
                     }
                 }
 
@@ -21981,7 +21981,7 @@ CTableCell.prototype =
                     else
                     {
                         this.Pr.TableCellBorders.Top = new CDocumentBorder();
-                        this.Pr.TableCellBorders.Top.Read_FromBinary( Reader );
+                        this.Pr.TableCellBorders.Top.readFromBinaryCollaborative( Reader );
                     }
                 }
 
@@ -22009,7 +22009,7 @@ CTableCell.prototype =
                     else
                     {
                         this.Pr.TableCellBorders.Bottom = new CDocumentBorder();
-                        this.Pr.TableCellBorders.Bottom.Read_FromBinary( Reader );
+                        this.Pr.TableCellBorders.Bottom.readFromBinaryCollaborative( Reader );
                     }
                 }
 

PowerPoint/Editor/Styles.js

@@ -2844,6 +2844,44 @@ CDocumentShd.prototype =
             this.Color.Read_FromBinary(Reader);
         else
             this.Color.Set(0, 0, 0);
+    },
+
+    writeToBinaryCollaborative: function(w)
+    {
+        w.WriteByte(this.Value);
+        w.WriteBool(isRealObject(this.unifill));
+        if(isRealObject(this.unifill))
+        {
+            this.unifill.Write_ToBinary2(w);
+        }
+        w.WriteBool(isRealObject(this.fillRef));
+        if(isRealObject(this.fillRef))
+        {
+            this.fillRef.Write_ToBinary2(w);
+        }
+    },
+
+    readFromBinaryCollaborative: function(r)
+    {
+        this.Value = r.GetByte();
+        if(r.GetBool())
+        {
+            this.unifill = new CUniFill();
+            this.unifill.Read_FromBinary2(r);
+        }
+        else
+        {
+            this.unifill = null;
+        }
+        if(r.GetBool())
+        {
+            this.fillRef = new StyleRef();
+            this.fillRef.Read_FromBinary2(r);
+        }
+        else
+        {
+            this.fillRef = null;
+        }
     }
 };
 
@@ -2986,6 +3024,51 @@ CDocumentBorder.prototype =
         this.Space = Reader.GetLong();
         this.Value = Reader.GetByte();
         this.Color.Read_FromBinary( Reader );
+    },
+
+
+    writeToBinaryCollaborative: function(w)
+    {
+        this.Color.Write_ToBinary(w);
+        w.WriteLong(this.Space);
+        w.WriteDouble(this.Size);
+        w.WriteByte(this.Value);
+        w.WriteBool(isRealObject(this.unifill));
+        if(isRealObject(this.unifill))
+        {
+            this.unifill.Write_ToBinary2(w);
+        }
+        w.WriteBool(isRealObject(this.lnRef));
+        if(isRealObject(this.lnRef))
+        {
+            this.lnRef.Write_ToBinary2(w);
+        }
+    },
+
+    readFromBinaryCollaborative: function(r)
+    {
+        this.Color.Read_FromBinary(r);
+        this.Space = r.GetLong();
+        this.Size  = r.GetDouble();
+        this.Value = r.GetByte();
+        if(r.GetBool())
+        {
+            this.unifill = new CUniFill();
+            this.unifill.Read_FromBinary2(r);
+        }
+        else
+        {
+            this.unifill = null;
+        }
+        if(r.GetBool())
+        {
+            this.lnRef = new StyleRef();
+            this.lnRef.Read_FromBinary2(r);
+        }
+        else
+        {
+            this.lnRef = null;
+        }
     }
 }