copy/paste старых формул

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

Word/Editor/GraphicObjects/GraphicObjects.js

@@ -1307,6 +1307,7 @@ CGraphicObjects.prototype =
                     drawing.Set_DrawingType(selectedObjects[i].parent.DrawingType);
                     drawing.GraphicObj.setParent(drawing);
                     drawing.CheckWH();
+					drawing.Set_ParaMath(selectedObjects[i].parent.ParaMath);
                     if(selectedObjects[i].parent.Extent)
                     {
                         drawing.setExtent(selectedObjects[i].parent.Extent.W, selectedObjects[i].parent.Extent.H)

Word/Editor/Serialize2.js

@@ -4014,7 +4014,15 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
                     {
                         CheckSpPrXfrm2(item.GraphicObj)
                     }
-                    oThis.bs.WriteItem(c_oSerRunType.pptxDrawing, function () { oThis.WriteImage(item); });
+					
+					if(this.copyParams && item.ParaMath)
+					{
+						oThis.bs.WriteItem(c_oSerRunType.object, function () { oThis.WriteObject(item); });
+					}
+					else
+					{
+						oThis.bs.WriteItem(c_oSerRunType.pptxDrawing, function () { oThis.WriteImage(item); });
+					}
                     break;
             }
         }
@@ -4446,6 +4454,13 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
             this.bs.WriteItem(c_oSerDocTableType.Cell_Content, function(){oInnerDocument.WriteDocumentContent(cell.Content);});
         }
     };
+	this.WriteObject = function (obj)
+    {
+        var oThis = this;
+		
+		oThis.bs.WriteItem(c_oSerParType.OMath, function(){oThis.boMaths.WriteArgNodes(obj.ParaMath.Root);});
+		oThis.bs.WriteItem(c_oSerRunType.pptxDrawing, function () { oThis.WriteImage(obj); });
+	};
 };
 function BinaryOtherTableWriter(memory, doc)
 {
@@ -8161,7 +8176,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
         if(null != oParaDrawing.wrappingPolygon)
             oParaDrawing.addWrapPolygon(oParaDrawing.wrappingPolygon);
 		if (oDrawing.ParaMath)
-			oParaDrawing.ParaMath = oDrawing.ParaMath;
+			oParaDrawing.Set_ParaMath(oDrawing.ParaMath);
 
         if(oParaDrawing.GraphicObj)
         {