Skip to content

S
sdkjs
Commit ccbd7cc5 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov
Browse files
Options

для mailmerge: сохранение в docx с CachedImage и без field 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62742 954022d7-b5bf-4e40-9824-e11837661b57
parent f8a1a2b6
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 35 deletions
Word/Editor/Serialize2.js
View file @ ccbd7cc5
......@@ -329,7 +329,8 @@ var c_oSerImageType2 = {
WrapTopAndBottom: 22,
Chart: 23,
ChartImg: 24,
Chart2: 25
Chart2: 25,
CachedImage: 26
};
var c_oSerEffectExtent = {
Left: 0,
......@@ -753,7 +754,7 @@ function CreateThemeUnifill(color, tint, shade){
return ret;
}
function BinaryFileWriter(doc)
function BinaryFileWriter(doc, bMailMergeDocx, bMailMergeHtml)
{
this.memory = new CMemory();
this.Document = doc;
......@@ -769,6 +770,10 @@ function BinaryFileWriter(doc)
nNumIdIndex: null,
oUsedStyleMap: null
};
this.saveParams = {
bMailMergeDocx: bMailMergeDocx,
bMailMergeHtml: bMailMergeHtml
};
this.Write = function()
{
window.global_pptx_content_writer._Start();
......@@ -824,8 +829,8 @@ function BinaryFileWriter(doc)
//Write StyleTable
this.WriteTable(c_oSerTableTypes.Style, new BinaryStyleTableWriter(this.memory, this.Document, oNumIdMap));
//Write DocumentTable
var oBinaryHeaderFooterTableWriter = new BinaryHeaderFooterTableWriter(this.memory, this.Document, oNumIdMap, oMapCommentId);
this.WriteTable(c_oSerTableTypes.Document, new BinaryDocumentTableWriter(this.memory, this.Document, oMapCommentId, oNumIdMap, null, oBinaryHeaderFooterTableWriter));
var oBinaryHeaderFooterTableWriter = new BinaryHeaderFooterTableWriter(this.memory, this.Document, oNumIdMap, oMapCommentId, this.saveParams);
this.WriteTable(c_oSerTableTypes.Document, new BinaryDocumentTableWriter(this.memory, this.Document, oMapCommentId, oNumIdMap, null, this.saveParams, oBinaryHeaderFooterTableWriter));
//Write HeaderFooter
this.WriteTable(c_oSerTableTypes.HdrFtr, oBinaryHeaderFooterTableWriter);
//Write OtherTable
......@@ -852,7 +857,7 @@ function BinaryFileWriter(doc)
this.copyParams.oUsedNumIdMap = {};
this.copyParams.nNumIdIndex = 1;
this.copyParams.oUsedStyleMap = {};
this.copyParams.bdtw = new BinaryDocumentTableWriter(this.memory, this.Document, null, this.copyParams.oUsedNumIdMap, this.copyParams, null);
this.copyParams.bdtw = new BinaryDocumentTableWriter(this.memory, this.Document, null, this.copyParams.oUsedNumIdMap, this.copyParams, this.saveParams, null);
this.copyParams.nDocumentWriterTablePos = 0;
this.copyParams.nDocumentWriterPos = 0;
......@@ -3208,7 +3213,7 @@ Binary_tblPrWriter.prototype =
}
}
};
function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId)
function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId, saveParams)
{
this.memory = memory;
this.Document = doc;
......@@ -3216,6 +3221,7 @@ function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId)
this.oMapCommentId = oMapCommentId;
this.aHeaders = [];
this.aFooters = [];
this.saveParams = saveParams;
this.bs = new BinaryCommonWriter(this.memory);
this.Write = function()
{
......@@ -3245,7 +3251,7 @@ function BinaryHeaderFooterTableWriter(memory, doc, oNumIdMap, oMapCommentId)
{
var oThis = this;
//Content
var dtw = new BinaryDocumentTableWriter(this.memory, this.Document, this.oMapCommentId, this.oNumIdMap, null, null);
var dtw = new BinaryDocumentTableWriter(this.memory, this.Document, this.oMapCommentId, this.oNumIdMap, null, this.saveParams, null);
this.bs.WriteItem(c_oSerHdrFtrTypes.HdrFtr_Content, function(){dtw.WriteDocumentContent(item.Content);});
};
};
......@@ -3449,7 +3455,7 @@ function BinaryNumberingTableWriter(memory, doc, oNumIdMap, oUsedNumIdMap)
}
};
};
function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyParams, oBinaryHeaderFooterTableWriter)
function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyParams, saveParams, oBinaryHeaderFooterTableWriter)
{
this.memory = memory;
this.Document = doc;
......@@ -3461,6 +3467,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
this.boMaths = new Binary_oMathWriter(this.memory);
this.oMapCommentId = oMapCommentId;
this.copyParams = copyParams;
this.saveParams = saveParams;
this.Write = function()
{
var oThis = this;
......@@ -3585,19 +3592,24 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
break;
case para_Field:
if(fieldtype_MERGEFIELD == item.FieldType){
var Instr = "MERGEFIELD";
for(var j = 0; j < item.Arguments.length; ++j){
var argument = item.Arguments[j];
argument = argument.replace(/(\\|")/g, "\\$1");
if(-1 != argument.indexOf(' '))
argument = "\"" + argument + "\"";
Instr += " " + argument;
if(this.saveParams && this.saveParams.bMailMergeDocx)
oThis.WriteParagraphContent(item, bUseSelection, false);
else
{
var Instr = "MERGEFIELD";
for(var j = 0; j < item.Arguments.length; ++j){
var argument = item.Arguments[j];
argument = argument.replace(/(\\|")/g, "\\$1");
if(-1 != argument.indexOf(' '))
argument = "\"" + argument + "\"";
Instr += " " + argument;
}
for(var j = 0; j < item.Switches.length; ++j)
Instr += " \\" + item.Switches[j];
this.bs.WriteItem(c_oSerParType.FldSimple, function () {
oThis.WriteFldSimple(Instr, function(){oThis.WriteParagraphContent(item, bUseSelection, false);});
});
}
for(var j = 0; j < item.Switches.length; ++j)
Instr += " \\" + item.Switches[j];
this.bs.WriteItem(c_oSerParType.FldSimple, function () {
oThis.WriteFldSimple(Instr, function(){oThis.WriteParagraphContent(item, bUseSelection, false);});
});
}
break;
case para_Hyperlink:
......@@ -3848,7 +3860,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
{
this.memory.WriteByte(c_oSerImageType2.PptxData);
this.memory.WriteByte(c_oSerPropLenType.Variable);
this.bs.WriteItemWithLength(function(){window.global_pptx_content_writer.WriteDrawing(oThis.memory, img.GraphicObj, oThis.Document, oThis.oMapCommentId, oThis.oNumIdMap, oThis.copyParams);});
this.bs.WriteItemWithLength(function(){window.global_pptx_content_writer.WriteDrawing(oThis.memory, img.GraphicObj, oThis.Document, oThis.oMapCommentId, oThis.oNumIdMap, oThis.copyParams, oThis.saveParams);});
}
}
else
......@@ -3973,9 +3985,15 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
{
this.memory.WriteByte(c_oSerImageType2.PptxData);
this.memory.WriteByte(c_oSerPropLenType.Variable);
this.bs.WriteItemWithLength(function(){window.global_pptx_content_writer.WriteDrawing(oThis.memory, img.GraphicObj, oThis.Document, oThis.oMapCommentId, oThis.oNumIdMap, oThis.copyParams);});
this.bs.WriteItemWithLength(function(){window.global_pptx_content_writer.WriteDrawing(oThis.memory, img.GraphicObj, oThis.Document, oThis.oMapCommentId, oThis.oNumIdMap, oThis.copyParams, oThis.saveParams);});
}
}
if(this.saveParams && this.saveParams.bMailMergeHtml)
{
this.memory.WriteByte(c_oSerImageType2.CachedImage);
this.memory.WriteByte(c_oSerPropLenType.Variable);
this.memory.WriteString2(img.getBase64Img());
}
};
this.WriteEffectExtent = function(EffectExtent)
{
......@@ -4239,7 +4257,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
//Content
if(null != cell.Content)
{
var oInnerDocument = new BinaryDocumentTableWriter(this.memory, this.Document, this.oMapCommentId, this.oNumIdMap, this.copyParams, this.oBinaryHeaderFooterTableWriter);
var oInnerDocument = new BinaryDocumentTableWriter(this.memory, this.Document, this.oMapCommentId, this.oNumIdMap, this.copyParams, this.saveParams, this.oBinaryHeaderFooterTableWriter);
this.bs.WriteItem(c_oSerDocTableType.Cell_Content, function(){oInnerDocument.WriteDocumentContent(cell.Content);});
}
};
......@@ -8105,6 +8123,13 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
return oThis.ReadWrapThroughTight(t, l, oParaDrawing.wrappingPolygon);
});
}
else if( c_oSerImageType2.CachedImage === type )
{
if(null != oParaDrawing.GraphicObj)
oParaDrawing.GraphicObj.cachedImage = this.stream.GetString2LE(length);
else
res = c_oSerConstants.ReadUnknown;
}
else
res = c_oSerConstants.ReadUnknown;
return res;
......
Word/Editor/SerializeCommon.js
View file @ ccbd7cc5
......@@ -851,7 +851,7 @@ function CPPTXContentWriter()
this.arrayStackStarts.splice(this.arrayStackStarts.length - 1, 1);
}
}
this.WriteDrawing = function(memory, grObject, Document, oMapCommentId, oNumIdMap, copyParams)
this.WriteDrawing = function(memory, grObject, Document, oMapCommentId, oNumIdMap, copyParams, saveParams)
{
this.TreeDrawingIndex++;
......@@ -865,11 +865,11 @@ function CPPTXContentWriter()
{
if(grObject.bWordShape)
{
this.WriteShape(grObject, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteShape(grObject, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
}
else
{
this.WriteShape2(grObject, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteShape2(grObject, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
}
break;
}
......@@ -880,7 +880,7 @@ function CPPTXContentWriter()
}
case historyitem_type_GroupShape:
{
this.WriteGroup(grObject, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteGroup(grObject, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
break;
}
}
......@@ -896,13 +896,13 @@ function CPPTXContentWriter()
this.arrayStackStarts.splice(this.arrayStackStarts.length - 1, 1);
}
this.WriteShape2 = function(shape, Document, oMapCommentId, oNumIdMap, copyParams)
this.WriteShape2 = function(shape, Document, oMapCommentId, oNumIdMap, copyParams, saveParams)
{
var _writer = this.BinaryFileWriter;
_writer.WriteShape(shape);
}
this.WriteShape = function(shape, Document, oMapCommentId, oNumIdMap, copyParams)
this.WriteShape = function(shape, Document, oMapCommentId, oNumIdMap, copyParams, saveParams)
{
var _writer = this.BinaryFileWriter;
_writer.StartRecord(1);
......@@ -943,7 +943,7 @@ function CPPTXContentWriter()
this.arrayStackStartsTextBoxContent.push(memory.pos);
var bdtw = new BinaryDocumentTableWriter(memory, Document, oMapCommentId, oNumIdMap, copyParams);
var bdtw = new BinaryDocumentTableWriter(memory, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
var bcw = new BinaryCommonWriter(memory);
bcw.WriteItemWithLength(function(){bdtw.WriteDocumentContent(shape.textBoxContent);});
......@@ -1047,7 +1047,7 @@ function CPPTXContentWriter()
this.arrayStackStarts.splice(this.arrayStackStarts.length - 1, 1);
}
this.WriteGroup = function(group, Document, oMapCommentId, oNumIdMap, copyParams)
this.WriteGroup = function(group, Document, oMapCommentId, oNumIdMap, copyParams, saveParams)
{
var _writer = this.BinaryFileWriter;
......@@ -1085,11 +1085,11 @@ function CPPTXContentWriter()
{
if(elem.bWordShape)
{
this.WriteShape(elem, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteShape(elem, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
}
else
{
this.WriteShape2(elem, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteShape2(elem, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
}
break;
}
......@@ -1100,7 +1100,7 @@ function CPPTXContentWriter()
}
case historyitem_type_GroupShape:
{
this.WriteGroup(elem, Document, oMapCommentId, oNumIdMap, copyParams);
this.WriteGroup(elem, Document, oMapCommentId, oNumIdMap, copyParams, saveParams);
break;
}
case historyitem_type_ChartSpace:
......
Word/api.js
View file @ ccbd7cc5
......@@ -7151,7 +7151,11 @@ function _downloadAs(editor, command, oDocumentMailMerge, oMailMergeSendData, fi
oLogicDocument = oDocumentMailMerge;
else
oLogicDocument = editor.WordControl.m_oLogicDocument;
var oBinaryFileWriter = new BinaryFileWriter(oLogicDocument);
var oBinaryFileWriter;
if(null != oMailMergeSendData && c_oAscFileType.HTML == oMailMergeSendData.get_MailFormat())
oBinaryFileWriter = new BinaryFileWriter(oLogicDocument, false, true);
else
oBinaryFileWriter = new BinaryFileWriter(oLogicDocument, true, true);
oAdditionalData["data"] = oBinaryFileWriter.Write();
}
if(null != oMailMergeSendData){
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7