Commit 5258d78b authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

+ к заливке 64501

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64508 954022d7-b5bf-4e40-9824-e11837661b57
parent fe25eef3
......@@ -325,7 +325,9 @@
var objectRender = worksheetView.objectRender;
var isIntoShape = objectRender.controller.getTargetDocContent();
var text = this._makeTableNode(activeRange, worksheetView, isCut, isIntoShape);
var html = this._makeTableNode(activeRange, worksheetView, isCut, isIntoShape);
if(html)
html = html.innerHTML;
History.TurnOff();
var sBase64 = null;
......@@ -333,7 +335,7 @@
sBase64 = this._getBinaryForCopy(worksheetView);
History.TurnOn();
return {sBase64: sBase64, text: text};
return {sBase64: sBase64, html: html, text: this.lStorageText};
},
_getHtmlBase64: function(range, worksheet, isCut)
......@@ -3023,7 +3025,7 @@
localStText += '\n';
for (col = bbox.c1; col <= bbox.c2; ++col) {
if(col != bbox.c1)
localStText += ' ';
localStText += '\t';
var currentRange = range.worksheet.getCell3(row, col);
//добавляем текст
var textRange = currentRange.getValue();
......
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