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

http://bugzserver/show_bug.cgi?id=25621 - Потеря данных при подлючении другого...

http://bugzserver/show_bug.cgi?id=25621 - Потеря данных при подлючении другого пользователя и ошибка в консоли

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57765 954022d7-b5bf-4e40-9824-e11837661b57
parent d955717a
...@@ -1807,6 +1807,8 @@ ...@@ -1807,6 +1807,8 @@
}; };
}; };
this.activeRange = worksheet.activeRange.clone(true);
//parse HTML //parse HTML
aResult = this._parseHtml(pasteFragment, node, worksheet, isText); aResult = this._parseHtml(pasteFragment, node, worksheet, isText);
......
...@@ -8215,7 +8215,8 @@ ...@@ -8215,7 +8215,8 @@
WorksheetView.prototype._setInfoAfterPaste = function (values,clipboard,isCheckSelection) { WorksheetView.prototype._setInfoAfterPaste = function (values,clipboard,isCheckSelection) {
var t = this; var t = this;
var arn = t.activeRange.clone(true); var wb = window["Asc"]["editor"].wb;
var arn = wb && wb.clipboard && wb.clipboard.activeRange ? wb.clipboard.activeRange : t.activeRange.clone(true);
var arrFormula = []; var arrFormula = [];
var numFor = 0; var numFor = 0;
var rMax = values.length + values.rowSpanSpCount; var rMax = values.length + values.rowSpanSpCount;
...@@ -8338,14 +8339,17 @@ ...@@ -8338,14 +8339,17 @@
} }
if(isMultiple) if(isMultiple)
{ {
var currentObj = values[arn.r1][arn.c1][0]; if(values[arn.r1] && values[arn.r1][arn.c1])
var valFormat = '';
if(currentObj[0] !== undefined)
valFormat = currentObj[0].text;
if(currentObj.format !== null && currentObj.format !== '' && currentObj.format !== undefined)
{ {
var nameFormat = clipboard._decode(currentObj.format.split(';')[0]); var currentObj = values[arn.r1][arn.c1][0];
valFormat = clipboard._decode(currentObj.format.split(';')[1]); var valFormat = '';
if(currentObj[0] !== undefined)
valFormat = currentObj[0].text;
if(currentObj.format !== null && currentObj.format !== '' && currentObj.format !== undefined)
{
var nameFormat = clipboard._decode(currentObj.format.split(';')[0]);
valFormat = clipboard._decode(currentObj.format.split(';')[1]);
}
} }
} }
for (var autoR = 0;autoR < maxARow; ++autoR) { for (var autoR = 0;autoR < maxARow; ++autoR) {
......
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