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

Excel/model/DrawingObjects/Format/Geometry.js

@@ -666,8 +666,17 @@ CGeometry.prototype=
         {
             Writer.WriteString2(this.preset);
         }
-        WriteObjectString(Writer, this.rectS);
-        WriteObjectDouble(Writer, this.rect);
+        var w = Writer;
+        w.WriteBool(isRealObject(this.rectS));
+        if(isRealObject(this.rectS))
+        {
+            w.WriteString2(this.rectS.l);
+            w.WriteString2(this.rectS.t);
+            w.WriteString2(this.rectS.r);
+            w.WriteString2(this.rectS.b);
+        }
+        // WriteObjectString(Writer, this.rectS);
+        //WriteObjectDouble(Writer, this.rect);
     },
 
     Read_FromBinary2: function(Reader)
@@ -788,9 +797,17 @@ CGeometry.prototype=
         {
             this.preset = r.GetString2();
         }
-        var rectS = ReadObjectString(r);
+        if(r.GetBool())
+        {
+            var rectS = {};
+            rectS.l = r.GetString2();
+            rectS.t = r.GetString2();
+            rectS.r = r.GetString2();
+            rectS.b = r.GetString2();
             this.AddRect(rectS.l, rectS.t, rectS.r, rectS.b);
-        this.rect = ReadObjectDouble(r);
+        }
+        //this.rect = ReadObjectDouble(r);
+        //this.rect = ReadObjectDouble(r);
     },
 
 

PowerPoint/Editor/Drawing/Geometry.js

@@ -644,8 +644,17 @@ Geometry.prototype=
         {
             Writer.WriteString2(this.preset);
         }
-        WriteObjectString(Writer, this.rectS);
-        WriteObjectDouble(Writer, this.rect);
+        var w = Writer;
+        w.WriteBool(isRealObject(this.rectS));
+        if(isRealObject(this.rectS))
+        {
+            w.WriteString2(this.rectS.l);
+            w.WriteString2(this.rectS.t);
+            w.WriteString2(this.rectS.r);
+            w.WriteString2(this.rectS.b);
+        }
+       // WriteObjectString(Writer, this.rectS);
+        //WriteObjectDouble(Writer, this.rect);
     },
 
     Read_FromBinary2: function(Reader)
@@ -759,8 +768,15 @@ Geometry.prototype=
         {
             this.preset = r.GetString2();
         }
-        this.rectS = ReadObjectString(r);
-        this.rect = ReadObjectDouble(r);
+        if(r.GetBool())
+        {
+            this.rectS = {};
+            this.rectS.l = r.GetString2();
+            this.rectS.t = r.GetString2();
+            this.rectS.r = r.GetString2();
+            this.rectS.b = r.GetString2();
+        }
+        //this.rect = ReadObjectDouble(r);
     },
 
     AddAdj: function(name, formula, x, y, z)

Word/Editor/GraphicObjects/ObjectTypes/Geometry.js

@@ -658,8 +658,17 @@ CGeometry.prototype=
         {
             Writer.WriteString2(this.preset);
         }
-        WriteObjectString(Writer, this.rectS);
-        WriteObjectDouble(Writer, this.rect);
+        var w = Writer;
+        w.WriteBool(isRealObject(this.rectS));
+        if(isRealObject(this.rectS))
+        {
+            w.WriteString2(this.rectS.l);
+            w.WriteString2(this.rectS.t);
+            w.WriteString2(this.rectS.r);
+            w.WriteString2(this.rectS.b);
+        }
+        // WriteObjectString(Writer, this.rectS);
+        //WriteObjectDouble(Writer, this.rect);
     },
 
     Read_FromBinary2: function(Reader)
@@ -773,8 +782,15 @@ CGeometry.prototype=
         {
             this.preset = r.GetString2();
         }
-        this.rectS = ReadObjectString(r);
-        this.rect = ReadObjectDouble(r);
+        if(r.GetBool())
+        {
+            this.rectS = {};
+            this.rectS.l = r.GetString2();
+            this.rectS.t = r.GetString2();
+            this.rectS.r = r.GetString2();
+            this.rectS.b = r.GetString2();
+        }
+        //this.rect = ReadObjectDouble(r);
     },
 
     AddAdj: function(name, formula, x, y, z)