git-svn-id:...

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

Common/Shapes/SerializeWriter.js

@@ -2494,7 +2494,7 @@ function CBinaryFileWriter()
             }
         }
 
-        oThis.WriteRecord1(0, shape.nvSpPr, oThis.WriteUniNvPr);
+        oThis.WriteRecord2(0, shape.nvSpPr, oThis.WriteUniNvPr);
         oThis.WriteRecord1(1, shape.spPr, oThis.WriteSpPr);
         oThis.WriteRecord2(2, shape.style, oThis.WriteShapeStyle);
         oThis.WriteRecord2(3, shape.txBody, oThis.WriteTxBody);

Word/Editor/SerializeCommon.js

@@ -717,9 +717,13 @@ function CPPTXContentWriter()
         this.BinaryFileWriter.StartRecord(0);
         this.BinaryFileWriter.StartRecord(1);
 
-        if (("undefined" !== typeof(WordShape) && grObject instanceof WordShape) || ("undefined" !== typeof(CShape) && grObject instanceof CShape))
+        if ("undefined" !== typeof(WordShape) && grObject instanceof WordShape)
         {
             this.WriteShape(grObject, Document, oMapCommentId, oNumIdMap);
+        }
+        else if ("undefined" !== typeof(CShape) && grObject instanceof CShape)
+        {
+            this.WriteShape2(grObject, Document, oMapCommentId, oNumIdMap);
         }
 		else if (("undefined" !== typeof(WordImage) && grObject instanceof WordImage) || ("undefined" !== typeof(CImageShape) && grObject instanceof CImageShape))
         {
@@ -742,6 +746,12 @@ function CPPTXContentWriter()
         this.arrayStackStarts.splice(this.arrayStackStarts.length - 1, 1);
     }
 
+    this.WriteShape2 = function(shape, Document, oMapCommentId, oNumIdMap)
+    {
+        var _writer = this.BinaryFileWriter;
+        _writer.WriteShape(shape);
+    }
+
     this.WriteShape = function(shape, Document, oMapCommentId, oNumIdMap)
     {
         var _writer = this.BinaryFileWriter;