Commit a741b442 authored by GoshaZotov's avatar GoshaZotov

paste para_Math

parent 057d8182
...@@ -1740,7 +1740,7 @@ ...@@ -1740,7 +1740,7 @@
{ {
graphicObject.bDeleted = true; graphicObject.bDeleted = true;
} }
graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model); graphicObject = graphicObject.convertToPPTX(ws.model.DrawingDocument, ws.model, true);
} }
......
...@@ -726,7 +726,7 @@ CShape.prototype.convertToWord = function (document) { ...@@ -726,7 +726,7 @@ CShape.prototype.convertToWord = function (document) {
return c; return c;
}; };
CShape.prototype.convertToPPTX = function (drawingDocument, worksheet) { CShape.prototype.convertToPPTX = function (drawingDocument, worksheet, bIsAddMath) {
var c = new CShape(); var c = new CShape();
c.setWordShape(false); c.setWordShape(false);
c.setBDeleted(false); c.setBDeleted(false);
...@@ -755,7 +755,7 @@ CShape.prototype.convertToPPTX = function (drawingDocument, worksheet) { ...@@ -755,7 +755,7 @@ CShape.prototype.convertToPPTX = function (drawingDocument, worksheet) {
for (var i = 0; i < paragraphs.length; ++i) { for (var i = 0; i < paragraphs.length; ++i) {
var cur_par = paragraphs[i]; var cur_par = paragraphs[i];
if (cur_par instanceof Paragraph) { if (cur_par instanceof Paragraph) {
var new_paragraph = ConvertParagraphToPPTX(cur_par, drawingDocument, new_content); var new_paragraph = ConvertParagraphToPPTX(cur_par, drawingDocument, new_content, bIsAddMath);
new_content.Internal_Content_Add(index++, new_paragraph, false); new_content.Internal_Content_Add(index++, new_paragraph, false);
} }
} }
......
...@@ -2679,7 +2679,7 @@ PasteProcessor.prototype = ...@@ -2679,7 +2679,7 @@ PasteProcessor.prototype =
presentationSelectedContent.Drawings[i].Drawing.setBDeleted(true); presentationSelectedContent.Drawings[i].Drawing.setBDeleted(true);
} }
}, this, []); }, this, []);
presentationSelectedContent.Drawings[i].Drawing = presentationSelectedContent.Drawings[i].Drawing.convertToPPTX(oThis.oDocument.DrawingDocument); presentationSelectedContent.Drawings[i].Drawing = presentationSelectedContent.Drawings[i].Drawing.convertToPPTX(oThis.oDocument.DrawingDocument, undefined, true);
AscFormat.checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing); AscFormat.checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing);
} }
} }
...@@ -2693,7 +2693,7 @@ PasteProcessor.prototype = ...@@ -2693,7 +2693,7 @@ PasteProcessor.prototype =
{ {
if(!(presentationSelectedContent.Drawings[i].Drawing instanceof CGraphicFrame)) if(!(presentationSelectedContent.Drawings[i].Drawing instanceof CGraphicFrame))
{ {
presentationSelectedContent.Drawings[i].Drawing = presentationSelectedContent.Drawings[i].Drawing.convertToPPTX(oThis.oDocument.DrawingDocument); presentationSelectedContent.Drawings[i].Drawing = presentationSelectedContent.Drawings[i].Drawing.convertToPPTX(oThis.oDocument.DrawingDocument, undefined, true);
AscFormat.checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing); AscFormat.checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment