правка бага 21957 - [CoEdit] Зависание приложения после выделения автофигуры...

правка бага 21957 - [CoEdit] Зависание приложения после выделения автофигуры ее копирования, удаления и передачи второму пользователю

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

Excel/model/DrawingObjects/Format/Geometry.js

@@ -541,7 +541,7 @@ CGeometry.prototype=
 
         }
 
-        WriteObjectLong(w, this.gdLst);
+         WriteObjectLong(w, this.gdLst);
 
 
 
@@ -713,13 +713,13 @@ CGeometry.prototype=
         }
 
 
-        this.gdLst = ReadObjectLong(r);
+         this.gdLst = ReadObjectLong(r);
 
-        var cnx_lst_count = Reader.GetLong();
-        for(index = 0; index < cnx_lst_count; ++index)
-        {
-            this.cnxLstInfo[index] = ReadObjectString(Reader);
-        }
+       var cnx_lst_count = Reader.GetLong();
+       for(index = 0; index < cnx_lst_count; ++index)
+       {
+           this.cnxLstInfo[index] = ReadObjectString(Reader);
+       }
 
         var ah_xy_count = Reader.GetLong();
         for(index = 0; index < ah_xy_count; ++index)

PowerPoint/Editor/Drawing/Geometry.js

@@ -684,7 +684,7 @@ Geometry.prototype=
         }
 
 
-        this.gdLst = ReadObjectLong(r);
+         this.gdLst = ReadObjectLong(r);
 
 
 

Word/Editor/GraphicObjects/ObjectTypes/Geometry.js

@@ -503,6 +503,10 @@ CGeometry.prototype=
             ++count;
         }
         w.WriteLong(count);
+        for(key in this.avLst)
+        {
+            w.WriteString2(key);
+        }
         var gd_lst_info_count = this.gdLstInfo.length;
         Writer.WriteLong(gd_lst_info_count);
 
@@ -531,10 +535,10 @@ CGeometry.prototype=
         }
 
         WriteObjectLong(w, this.gdLst);
-        for(key in this.avLst)
-        {
-            w.WriteString2(key);
-        }
+       // for(key in this.avLst)
+       // {
+          //  w.WriteString2(key);
+        //}
 
 
         var cnx_lst_count = this.cnxLstInfo.length;
@@ -667,8 +671,6 @@ CGeometry.prototype=
             w.WriteString2(this.rectS.r);
             w.WriteString2(this.rectS.b);
         }
-        // WriteObjectString(Writer, this.rectS);
-        //WriteObjectDouble(Writer, this.rect);
     },
 
     Read_FromBinary2: function(Reader)
@@ -699,14 +701,14 @@ CGeometry.prototype=
         }
 
 
-        this.gdLst = ReadObjectLong(r);
+      this.gdLst = ReadObjectLong(r);
 
 
-        var cnx_lst_count = Reader.GetLong();
-        for(index = 0; index < cnx_lst_count; ++index)
-        {
-            this.cnxLstInfo[index] = ReadObjectString(Reader);
-        }
+       var cnx_lst_count = Reader.GetLong();
+       for(index = 0; index < cnx_lst_count; ++index)
+       {
+           this.cnxLstInfo[index] = ReadObjectString(Reader);
+       }
 
         var ah_xy_count = Reader.GetLong();
         for(index = 0; index < ah_xy_count; ++index)
@@ -790,7 +792,7 @@ CGeometry.prototype=
             this.rectS.r = r.GetString2();
             this.rectS.b = r.GetString2();
         }
-        //this.rect = ReadObjectDouble(r);
+        this.Init(5, 5);
     },
 
     AddAdj: function(name, formula, x, y, z)