Commit bb0e442a authored by Oleg Korshul's avatar Oleg Korshul

html file new doct file

parent 5b046af5
...@@ -1221,7 +1221,7 @@ function BinaryFileWriter(doc, bMailMergeDocx, bMailMergeHtml) ...@@ -1221,7 +1221,7 @@ function BinaryFileWriter(doc, bMailMergeDocx, bMailMergeHtml)
oUsedStyleMap: null oUsedStyleMap: null
}; };
this.saveParams = new DocSaveParams(bMailMergeDocx, bMailMergeHtml); this.saveParams = new DocSaveParams(bMailMergeDocx, bMailMergeHtml);
this.Write = function(noBase64) this.Write = function(noBase64, onlySaveBase64)
{ {
pptx_content_writer._Start(); pptx_content_writer._Start();
if (noBase64) { if (noBase64) {
...@@ -1230,7 +1230,11 @@ function BinaryFileWriter(doc, bMailMergeDocx, bMailMergeHtml) ...@@ -1230,7 +1230,11 @@ function BinaryFileWriter(doc, bMailMergeDocx, bMailMergeHtml)
this.WriteMainTable(); this.WriteMainTable();
pptx_content_writer._End(); pptx_content_writer._End();
if (noBase64) { if (noBase64) {
return this.memory.GetData(); if (onlySaveBase64) {
return this.memory.GetBase64Memory();
} else {
return this.memory.GetData();
}
} else { } else {
return this.GetResult(); return this.GetResult();
} }
......
...@@ -7986,6 +7986,12 @@ background-repeat: no-repeat;\ ...@@ -7986,6 +7986,12 @@ background-repeat: no-repeat;\
var oBinaryFileWriter = new AscCommonWord.BinaryFileWriter(this.WordControl.m_oLogicDocument); var oBinaryFileWriter = new AscCommonWord.BinaryFileWriter(this.WordControl.m_oLogicDocument);
return oBinaryFileWriter.Write(); return oBinaryFileWriter.Write();
}; };
window["asc_docs_api"].prototype["asc_nativeGetFile2"] = function()
{
var oBinaryFileWriter = new AscCommonWord.BinaryFileWriter(this.WordControl.m_oLogicDocument);
return oBinaryFileWriter.Write(false, true);
};
window["asc_docs_api"].prototype["asc_nativeGetFileData"] = function() window["asc_docs_api"].prototype["asc_nativeGetFileData"] = function()
{ {
......
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