правка бага 19277

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

Word/Editor/GraphicObjects/ObjectTypes/WordShape.js

@@ -2411,13 +2411,17 @@ WordShape.prototype =
         }
         historyData.old_geometryPreset = isRealObject(this.spPr.geometry) ? this.spPr.geometry.preset : null;
         historyData.new_geometryPreset = _final_preset;
+        historyData.oldGeometry = this.spPr.geometry;
+
 
 
-        History.Add(this, historyData);
 
         this.spPr.geometry = CreateGeometry(_final_preset);
         this.spPr.geometry.Init(100, 100);
+        historyData.newGeometry = this.spPr.geometry;
         this.calculateAfterResize();
+        History.Add(this, historyData);
+
     },
 
 
@@ -4226,7 +4230,11 @@ WordShape.prototype =
                     this.spPr.ln = data.oldLine;
                     this.calculateLine();
                 }
+                if(typeof data.old_geometryPreset === "string")
                     this.spPr.geometry = CreateGeometry(data.old_geometryPreset);
+                else
+                    this.spPr.geometry = data.oldGeometry;
+                if(this.spPr.geometry)
                     this.spPr.geometry.Init(100, 100);
                 this.calculateAfterResize();
                 break;