Skip to content

S
sdkjs
Commit 617c5d0d authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
Browse files
Options

при copy/paste пользую функцию Get_SelectedContent() для получения... 

при copy/paste пользую функцию Get_SelectedContent() для получения заселекченного контента + добавил функцию для получения отдельно бинарника(без полчения html)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59019 954022d7-b5bf-4e40-9824-e11837661b57
parent 93d642c7
Show whitespace changes
Inline Side-by-side
Showing with 380 additions and 327 deletions
Common/wordcopypaste.js
View file @ 617c5d0d
......@@ -331,15 +331,21 @@ function Editor_Copy(api, bCut)
}
*/
};
function CopyProcessor(api, ElemToSelect)
function CopyProcessor(api, ElemToSelect, onlyBinaryCopy)
{
this.api = api;
this.oDocument = api.WordControl.m_oLogicDocument;
this.oBinaryFileWriter = new BinaryFileWriter(this.oDocument);
this.fontsArray = api.FontLoader.fontInfos;
this.ElemToSelect = ElemToSelect;
if(!onlyBinaryCopy)
{
this.Ul = document.createElement( "ul" );
this.Ol = document.createElement( "ol" );
}
this.onlyBinaryCopy = onlyBinaryCopy;
this.Para;
this.bOccurEndPar;
this.oCurHyperlink = null;
......@@ -398,9 +404,9 @@ CopyProcessor.prototype =
{
//pPr
var apPr = [];
var Def_pPr = this.oDocument.Styles.Default.ParaPr;
var Item_pPr = Item.CompiledPr.Pr.ParaPr;
if(Item_pPr)
var Def_pPr = this.oDocument.Styles ? this.oDocument.Styles.Default.ParaPr : null;
var Item_pPr = Item.CompiledPr && Item.CompiledPr.Pr && Item.CompiledPr.Pr.ParaPr ? Item.CompiledPr.Pr.ParaPr : Item.Pr;
if(Item_pPr && Def_pPr)
{
//Ind
if(Def_pPr.Ind.Left != Item_pPr.Ind.Left)
......@@ -671,14 +677,20 @@ CopyProcessor.prototype =
if(ParaStart < 0)
ParaStart = 0;
for (var i = ParaStart; i <= ParaEnd; i++) {
for (var i = 0; i < Container.Content.length; i++) {
var item = Container.Content[i];
if (para_Run == item.Type) {
var sRunContent = this.CopyRun(item, bUseSelection);
if(sRunContent)
{
sRes += "<span";
var oStyle = this.parse_para_TextPr(item.CompiledPr);
var oStyle;
if(g_bIsDocumentCopyPaste)
oStyle = this.parse_para_TextPr(item.Get_CompiledTextPr());
else
oStyle = this.parse_para_TextPr(item.Pr);
if (oStyle && oStyle.style)
sRes += " style=\"" + oStyle.style + "\"";
sRes += ">";
......@@ -986,7 +998,7 @@ CopyProcessor.prototype =
if("" != tcStyle)
tc.setAttribute("style", tcStyle);
//Content
this.CopyDocument(tc, cell.Content, false);
this.CopyDocument2(tc, cell.Content, false);
tr.appendChild(tc);
},
......@@ -997,12 +1009,15 @@ CopyProcessor.prototype =
elems = {gridStart: 0, gridEnd: table.TableGrid.length - 1, indexStart: null, indexEnd: null, after: null, before: null, cells: row.Content};
var tr = document.createElement( "tr" );
//Pr
table.Internal_RecalculateGrid();
var gridSum = table.TableSumGrid;
var trStyle = "";
var nGridBefore = 0;
var rowPr = null;
if(null != row.CompiledPr && null != row.CompiledPr.Pr)
rowPr = row.CompiledPr.Pr;
var CompiledPr = row.Get_CompiledPr();
if(null != CompiledPr)
rowPr = CompiledPr;
if(null != rowPr)
{
if(null == elems.before && null != rowPr.GridBefore && rowPr.GridBefore > 0)
......@@ -1043,6 +1058,11 @@ CopyProcessor.prototype =
tr.appendChild(oNewTd);
}
}
var tablePr = null;
var compiledTablePr = table.Get_CompiledPr();
if(null != compiledTablePr && null != compiledTablePr.TablePr)
tablePr = compiledTablePr.TablePr;
//tc
for(var i in elems.cells)
{
......@@ -1060,9 +1080,6 @@ CopyProcessor.prototype =
if(nRowSpan <= 0)
nRowSpan = 1;
}
var tablePr = null;
if(null != table.CompiledPr && null != table.CompiledPr.Pr && null != table.CompiledPr.Pr.TablePr)
tablePr = table.CompiledPr.Pr.TablePr;
this.CopyCell(tr, cell, tablePr, width, nRowSpan);
}
}
......@@ -1097,9 +1114,12 @@ CopyProcessor.prototype =
{
this.CommitList(oDomTarget);
var DomTable = document.createElement( "table" );
var compiledPr = table.Get_CompiledPr();
var Pr = null;
if(null != table.CompiledPr && null != table.CompiledPr.Pr && null != table.CompiledPr.Pr.TablePr)
Pr = table.CompiledPr.Pr.TablePr;
if(compiledPr && null != compiledPr.TablePr)
Pr = compiledPr.TablePr;
var tblStyle = "";
var bBorder = false;
if(null != Pr)
......@@ -1158,10 +1178,11 @@ CopyProcessor.prototype =
if(table.Content.length > 0)
{
var firstRow = table.Content[0];
if(null != firstRow.Pr && null != firstRow.Pr.TableCellSpacing)
var rowPr = firstRow.Get_CompiledPr();
if(null != rowPr && null != rowPr.TableCellSpacing)
{
bAddSpacing = true;
var cellSpacingMM = firstRow.Pr.TableCellSpacing;
var cellSpacingMM = rowPr.TableCellSpacing;
tblStyle += "mso-cellspacing:"+(cellSpacingMM * g_dKoef_mm_to_pt)+"pt;";
DomTable.setAttribute("cellspacing", Math.round(cellSpacingMM * g_dKoef_mm_to_pix));
}
......@@ -1389,247 +1410,245 @@ CopyProcessor.prototype =
}
this.CommitList(oDomTarget);
},
Start : function(node)
CopyDocument2 : function(oDomTarget, oDocument, bUseSelection, elementsContent)
{
this.oBinaryFileWriter.CopyStart();
var oDocument = this.oDocument;
if(g_bIsDocumentCopyPaste)
{
if(!this.api.DocumentReaderMode)
if(!elementsContent && oDocument && oDocument.Content)
elementsContent = oDocument.Content;
for ( var Index = 0; Index < elementsContent.length; Index++ )
{
var Def_pPr = oDocument.Styles.Default.ParaPr;
if(docpostype_HdrFtr === oDocument.CurPos.Type)
var Item;
if(elementsContent[Index].Element)
Item = elementsContent[Index].Element;
else
Item = elementsContent[Index];
if(type_Table === Item.GetType() )
{
if(null != oDocument.HdrFtr && null != oDocument.HdrFtr.CurHdrFtr && null != oDocument.HdrFtr.CurHdrFtr.Content)
oDocument = oDocument.HdrFtr.CurHdrFtr.Content;
this.oBinaryFileWriter.copyParams.bLockCopyElems++;
if(!this.onlyBinaryCopy)
this.CopyTable(oDomTarget, Item, null);
this.oBinaryFileWriter.copyParams.bLockCopyElems--;
this.oBinaryFileWriter.CopyTable(Item, null);
}
if ( oDocument.CurPos.Type == docpostype_FlowObjects )
else if ( type_Paragraph === Item.GetType() )
{
var oData = oDocument.Selection.Data.FlowObject;
switch ( oData.Get_Type() )
//todo ����� ������ ��� �������� ������ ���� Index == End
this.oBinaryFileWriter.CopyParagraph(Item, elementsContent[Index].SelectedAll);
if(!this.onlyBinaryCopy)
this.CopyParagraph(oDomTarget, Item, true, false);
}
}
}
else//presentation
{
case flowobject_Image:
//DocContent/ Drawings/ SlideObjects
var presentation = this.oDocument;
this.oPresentationWriter.WriteString2(editor.DocumentUrl);
this.oPresentationWriter.WriteDouble(presentation.Width);
this.oPresentationWriter.WriteDouble(presentation.Height);
if(elementsContent.DocContent)//пишем контент
{
this.Para = document.createElement("p");
var sInnerHtml = this.ParseItem(oData);
var oImg = oData;
var sSrc = oImg.Img;
if(sSrc.length > 0)
var docContent = elementsContent.DocContent;
if(docContent.Elements)
{
sSrc = this.getSrc(sSrc);
var elements = docContent.Elements;
if (this.api.DocumentReaderMode)
sInnerHtml += "<img style=\"max-width:100%;\" width=\""+Math.round(oImg.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(oImg.H * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
//пишем метку и длины
this.oPresentationWriter.WriteString2("Content");
this.oPresentationWriter.WriteDouble(elements.length);
//пишем контент
for ( var Index = 0; Index < elements.length; Index++ )
{
var Item;
if(elements[Index].Element)
Item = elements[Index].Element;
else
sInnerHtml += "<img width=\""+Math.round(oImg.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(oImg.H * g_dKoef_mm_to_pix)+"\" src=\""+sSrc+"\" />";
}
this.Para.innerHTML = sInnerHtml;
this.ElemToSelect.appendChild( this.Para );
return;
}
case flowobject_Table:
Item = elements[Index];
if ( type_Paragraph === Item.GetType() )
{
if(null != oData.Table && null != oData.Table.CurCell && null != oData.Table.CurCell.Content)
oDocument = oData.Table.CurCell.Content;
break;
//todo ����� ������ ��� �������� ������ ���� Index == End
//this.oPresentationWriter.WriteParagraph(Item);
//this.CopyPresentationText(this.ElemToSelect, graphicObjects.State.textObject.graphicObject.CurCell.Content, true);
//this.CopyParagraph(oDomTarget, Item, true, false);
this.oPresentationWriter.StartRecord(0);
this.oPresentationWriter.WriteParagraph(Item);
this.oPresentationWriter.EndRecord();
this.CopyParagraph(oDomTarget, Item, true, false);
}
}
}
if(oDocument.CurPos.Type === docpostype_DrawingObjects)
{
var content = oDocument.DrawingObjects.getTargetDocContent();
if(content)
{
oDocument = content;
}
else if(oDocument.DrawingObjects.selection.groupSelection && oDocument.DrawingObjects.selection.groupSelection.selectedObjects && oDocument.DrawingObjects.selection.groupSelection.selectedObjects.length)
else if(elementsContent.Drawings && elementsContent.Drawings.length)//пишем графические объекты
{
var elements = elementsContent.Drawings;
var s_arr = oDocument.DrawingObjects.selection.groupSelection.selectedObjects;
this.Para = document.createElement("p");
this.Para = document.createElement( "p" );
//var selected_objects = graphicObjects.State.id === STATES_ID_GROUP ? graphicObjects.State.group.selectedObjects : graphicObjects.selectedObjects;
if(copyPasteUseBinary)
{
var newArr = null;
var tempAr = null;
if(s_arr)
//пишем метку и длины
this.oPresentationWriter.WriteString2("Drawings");
this.oPresentationWriter.WriteULong(elements.length);
for(var i = 0; i < elements.length; ++i)
{
tempAr = [];
for(var k = 0; k < s_arr.length; k++)
if(!(elements[i] instanceof CGraphicFrame))
{
tempAr[k] = s_arr[k].y;
}
this.oPresentationWriter.WriteBool(true);
this.CopyGraphicObject(this.ElemToSelect, elements[i].Drawing);
this.oPresentationWriter.WriteDouble(elements[i].X);
this.oPresentationWriter.WriteDouble(elements[i].Y);
this.oPresentationWriter.WriteDouble(elements[i].ExtX);
this.oPresentationWriter.WriteDouble(elements[i].ExtY);
}
tempAr.sort(fSortAscending);
newArr = [];
for(var k = 0; k < tempAr.length; k++)
{
var absOffsetY = tempAr[k];
for(var i = 0; i < s_arr.length; i++)
{
if(absOffsetY == s_arr[i].y)
else
{
newArr[k] = s_arr[i];
}
}
this.oPresentationWriter.WriteBool(false);
this.CopyPresentationTableFull(this.ElemToSelect, elements[i].Drawing);
}
if(newArr != null)
s_arr = newArr;
}
for(var i = 0; i < s_arr.length; ++i)
{
var paraDrawing = s_arr[i].parent ? s_arr[i].parent : s_arr[i].group.parent;
var graphicObj = s_arr[i];
if(isRealObject(paraDrawing.Parent))
{
var base64_img = paraDrawing.getBase64Img();
if(copyPasteUseBinary)
for(var i = 0; i < this.Para.childNodes.length; i++)
this.ElemToSelect.appendChild( this.Para.childNodes[i].cloneNode(true));
}
else if(elementsContent.SlideObjects && elementsContent.SlideObjects.length)//пишем слайды целиком
{
var wrappingType = oDocument.DrawingObjects.selection.groupSelection.parent.wrappingType;
var DrawingType = oDocument.DrawingObjects.selection.groupSelection.parent.DrawingType;
var tempParagraph = new Paragraph(oDocument, oDocument, 0, 0, 0, 0, 0);
var index = 0;
tempParagraph.Content.unshift(new ParaRun());
var paraRun = tempParagraph.Content[index];
paraRun.Content.unshift(new ParaDrawing());
paraRun.Content[index].wrappingType = wrappingType;
paraRun.Content[index].DrawingType = DrawingType;
paraRun.Content[index].GraphicObj = graphicObj;
var selected_slides = elementsContent.SlideObjects;
paraRun.Selection.EndPos = index + 1;
paraRun.Selection.StartPos = index;
paraRun.Selection.Use = true;
tempParagraph.Selection.EndPos = index + 1;
tempParagraph.Selection.StartPos = index;
tempParagraph.Selection.Use = true;
tempParagraph.bFromDocument = true;
this.oBinaryFileWriter.CopyParagraph(tempParagraph);
};
this.Para = document.createElement( "p" );
this.oPresentationWriter.WriteString2("SlideObjects");
var src = this.getSrc(base64_img);
this.Para.innerHTML += "<img style=\"max-width:100%;\" width=\""+Math.round(paraDrawing.absExtX * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(paraDrawing.absExtY * g_dKoef_mm_to_pix)+"\" src=\""+src+"\" />";
this.oPresentationWriter.WriteULong(selected_slides.length);
var layouts_map = {};
var layout_count = 0;
editor.WordControl.m_oLogicDocument.CalculateComments();
this.ElemToSelect.appendChild( this.Para );
//пишем слайд
var slide;
for(var i = 0; i < selected_slides.length; ++i)
{
slide = selected_slides[i].Slide;
this.CopySlide(this.ElemToSelect, slide);
if(!layouts_map[slide.Layout.Get_Id()])
++layout_count;
layouts_map[slide.Layout.Get_Id()] = slide.Layout;
}
//пишем layout
this.oPresentationWriter.WriteULong(layout_count);
var arr_layouts_id = [];
var t = 0;
for(var key in layouts_map)
{
this.CopyLayout(layouts_map[key]);
arr_layouts_id[t] = layouts_map[key];
++t;
}
if(copyPasteUseBinary)
var arr_ind = [];
for(var i = 0; i < selected_slides.length; ++i)
{
this.oBinaryFileWriter.CopyEnd();
var sBase64 = this.oBinaryFileWriter.GetResult();
if(this.ElemToSelect.children && this.ElemToSelect.children.length == 1 && window.USER_AGENT_SAFARI_MACOS)
for(t = 0; t < arr_layouts_id.length; ++t)
{
$(this.ElemToSelect.children[0]).css("font-weight", "normal");
$(this.ElemToSelect.children[0]).wrap(document.createElement("b"));
if(selected_slides[i].Slide.Layout === arr_layouts_id[t])
{
arr_ind[i] = t;
break;
}
if(this.ElemToSelect.children[0])
$(this.ElemToSelect.children[0]).addClass("docData;" + sBase64);
}
}
else
{
var gr_objects = oDocument.DrawingObjects;
var selection_array = gr_objects.selectedObjects;
this.Para = document.createElement( "span" );
var selectionTrue;
var selectIndex;
for(var i = 0; i < selection_array.length; ++i)
for(var i = 0; i < arr_ind.length; ++i)
{
var cur_element = selection_array[i].parent;
var base64_img = cur_element.getBase64Img();
var src = this.getSrc(base64_img);
this.Para.innerHTML = "<img style=\"max-width:100%;\" width=\""+Math.round(cur_element.W * g_dKoef_mm_to_pix)+"\" height=\""+Math.round(cur_element.H * g_dKoef_mm_to_pix)+"\" src=\""+src+"\" />";
this.oPresentationWriter.WriteULong(arr_ind[i]);
}
for(var i = 0; i < this.Para.childNodes.length; i++)
this.ElemToSelect.appendChild( this.Para.childNodes[i].cloneNode(true) );
}
}
this.ElemToSelect.appendChild( this.Para );
if(!this.onlyBinaryCopy)
this.CommitList(oDomTarget);
},
if(copyPasteUseBinary)
getSelectedBinary : function()
{
var paragraph = cur_element.Parent;
var oDocument = this.oDocument;
var inIndex;
var paragraphIndex;
var content;
var curParaRun;
for(var k = 0; k < paragraph.Content.length;k++)
if(g_bIsDocumentCopyPaste)
{
content = paragraph.Content[k].Content;
if(!content)
continue;
var selectedContent = oDocument.Get_SelectedContent();
for(var n = 0; n < content.length; n++)
var elementsContent;
if(selectedContent && selectedContent.Elements && selectedContent.Elements[0] && selectedContent.Elements[0].Element)
elementsContent = selectedContent.Elements;
else
return false;
var drawingUrls = [];
if(selectedContent.DrawingObjects && selectedContent.DrawingObjects.length)
{
if(content[n] == cur_element)
var url, correctUrl, graphicObj;
for(var i = 0; i < selectedContent.DrawingObjects.length; i++)
{
curParaRun = paragraph.Content[k];
inIndex = n;
paragraphIndex = k;
break;
};
};
};
selectionTrue =
graphicObj = selectedContent.DrawingObjects[i].GraphicObj;
if(graphicObj.isImage())
{
EndPos : curParaRun.Selection.EndPos,
StartPos: curParaRun.Selection.StartPos,
EndPosParagraph : paragraph.Selection.EndPos,
StartPosParagraph: paragraph.Selection.StartPos
};
url = graphicObj.getImageUrl();
if(window.NativeCorrectImageUrlOnCopy)
{
correctUrl = window.NativeCorrectImageUrlOnCopy(url);
//меняем Selection
curParaRun.Selection.EndPos = inIndex + 1;
curParaRun.Selection.StartPos = inIndex;
curParaRun.Selection.Use = true;
drawingUrls[i] = correctUrl;
}
}
}
}
paragraph.Selection.EndPos = paragraphIndex;
paragraph.Selection.StartPos = paragraphIndex;
paragraph.Selection.Use = true;
//подменяем Document для копирования(если не подменить, то commentId будет не соответствовать)
this.oBinaryFileWriter.Document = elementsContent[0].Element.LogicDocument;
this.oBinaryFileWriter.CopyParagraph(paragraph);
this.oBinaryFileWriter.CopyStart();
this.CopyDocument2(null, oDocument, false, elementsContent);
this.oBinaryFileWriter.CopyEnd();
//возвращаем Selection
curParaRun.Selection.StartPos = selectionTrue.StartPos;
curParaRun.Selection.EndPos = selectionTrue.EndPos;
var sBase64 = this.oBinaryFileWriter.GetResult();
var text = "";
paragraph.Selection.StartPos = selectionTrue.StartPosParagraph;
paragraph.Selection.EndPos = selectionTrue.EndPosParagraph;
}
return {sBase64: sBase64, text: text, drawingUrls: drawingUrls};
}
},
if(copyPasteUseBinary)
{
this.oBinaryFileWriter.CopyEnd();
var sBase64 = this.oBinaryFileWriter.GetResult();
if(this.ElemToSelect.children && this.ElemToSelect.children.length == 1 && window.USER_AGENT_SAFARI_MACOS)
Start : function(node)
{
$(this.ElemToSelect.children[0]).css("font-weight", "normal");
$(this.ElemToSelect.children[0]).wrap(document.createElement("b"));
}
if(this.ElemToSelect.children[0])
$(this.ElemToSelect.children[0]).addClass("docData;" + sBase64);
}
return;
}
}
if ( true === oDocument.Selection.Use )
var oDocument = this.oDocument;
if(g_bIsDocumentCopyPaste)
{
this.CopyDocument(this.ElemToSelect, oDocument, true);
}
}
var selectedContent = oDocument.Get_SelectedContent();
var elementsContent;
if(selectedContent && selectedContent.Elements && selectedContent.Elements[0] && selectedContent.Elements[0].Element)
elementsContent = selectedContent.Elements;
else
this.CopyDocument(this.ElemToSelect, oDocument, false);
return;
//подменяем Document для копирования(если не подменить, то commentId будет не соответствовать)
this.oBinaryFileWriter.Document = elementsContent[0].Element.LogicDocument;
this.oBinaryFileWriter.CopyStart();
this.CopyDocument2(this.ElemToSelect, oDocument, false, elementsContent);
this.oBinaryFileWriter.CopyEnd();
}
else
{
......@@ -2929,11 +2948,12 @@ PasteProcessor.prototype =
this.bInBlock = oRes.bInBlock;
return oRes;
},
Start : function(node, nodeDisplay, bDuplicate)
Start : function(node, nodeDisplay, bDuplicate, onlyBinary)
{
//PASTE
if(null == nodeDisplay)
nodeDisplay = node;
if(g_bIsDocumentCopyPaste)
if(g_bIsDocumentCopyPaste)//document
{
var oThis = this;
//удаляем в начале, иначе может получиться что будем вставлять в элементы, которое потом удалим.
......@@ -2953,6 +2973,15 @@ PasteProcessor.prototype =
// return;
if(copyPasteUseBinary)
{
if(onlyBinary)
{
base64 = onlyBinary;
if(base64 != null)
aContent = this.ReadFromBinary(base64);
pasteFromBinary = true;
}
else
{
var base64 = null, base64FromExcel = null,classNode, aContent, aContentExcel, pasteFromBinary = false;
......@@ -3004,6 +3033,8 @@ PasteProcessor.prototype =
pasteFromBinary = true;
else if(aContentExcel != null && aContent && aContent.content)
pasteFromBinary = true;
}
if(pasteFromBinary)
{
......@@ -3029,10 +3060,31 @@ PasteProcessor.prototype =
oImagesToDownload[src] = 1;
}
}
var aImagesToDownload = [];
for(var i in oImagesToDownload)
aImagesToDownload.push(i);
if(aImagesToDownload.length > 0)
{
if(onlyBinary && window.NativeCorrectImageUrlOnPaste)
{
var url;
for(var i = 0, length = aContent.aPastedImages.length; i < length; ++i)
{
url = window.NativeCorrectImageUrlOnPaste(aContent.aPastedImages[i].Url);
aContent.images[i] = url;
var imageElem = aContent.aPastedImages[i];
if(null != imageElem)
{
imageElem.SetUrl(url);
}
}
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
}
else
{
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
sendCommand( this.api, function(incomeObject){
......@@ -3060,10 +3112,11 @@ PasteProcessor.prototype =
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
}, rData );
}
}
else
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
return;
};
}
};
var presentation = editor.WordControl.m_oLogicDocument;
......
Word/Editor/Serialize2.js
View file @ 617c5d0d
......@@ -846,13 +846,13 @@ function BinaryFileWriter(doc)
this.copyParams.nDocumentWriterTablePos = this.WriteTableStart(c_oSerTableTypes.Document);
this.copyParams.nDocumentWriterPos = this.bs.WriteItemWithLengthStart();
}
this.CopyParagraph = function(Item)
this.CopyParagraph = function(Item, selectedAll)
{
//сами параграфы скопируются в методе CopyTable, нужно только проанализировать стили
if(this.copyParams.bLockCopyElems > 0)
return;
var oThis = this;
this.bs.WriteItem(c_oSerParType.Par, function(){oThis.copyParams.bdtw.WriteParapraph(Item, true);});
this.bs.WriteItem(c_oSerParType.Par, function(){oThis.copyParams.bdtw.WriteParapraph(Item, false, selectedAll);});
this.copyParams.itemCount++;
}
this.CopyTable = function(Item, aRowElems, nMinGrid, nMaxGrid)
......@@ -3489,7 +3489,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
this.bs.WriteItem(c_oSerParType.sectPr, function(){oThis.bpPrs.WriteSectPr(oThis.Document.SectPr, oThis.Document);});
}
};
this.WriteParapraph = function(par, bUseSelection)
this.WriteParapraph = function(par, bUseSelection, selectedAll)
{
var oThis = this;
if(null != this.copyParams)
......@@ -3547,10 +3547,10 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
if(null != par.Content)
{
this.memory.WriteByte(c_oSerParType.Content);
this.bs.WriteItemWithLength(function(){oThis.WriteParagraphContent(par, bUseSelection ,true);});
this.bs.WriteItemWithLength(function(){oThis.WriteParagraphContent(par, bUseSelection ,true, selectedAll);});
}
};
this.WriteParagraphContent = function (par, bUseSelection, bLastRun)
this.WriteParagraphContent = function (par, bUseSelection, bLastRun, selectedAll)
{
var ParaStart = 0;
var ParaEnd = par.Content.length - 1;
......@@ -3628,7 +3628,7 @@ function BinaryDocumentTableWriter(memory, doc, oMapCommentId, oNumIdMap, copyPa
}
}
if (bLastRun && bUseSelection && !par.Selection_CheckParaEnd() )
if ((bLastRun && bUseSelection && !par.Selection_CheckParaEnd()) || (selectedAll != undefined && selectedAll === false) )
{
this.WriteRun2( function () {
oThis.memory.WriteByte(c_oSerRunType._LastRun);
......
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