Commit 9d1b50cc authored by Alexey.Musinov's avatar Alexey.Musinov

fix crash

parent d1a54e09
...@@ -7505,6 +7505,10 @@ function testLockedObjects () { ...@@ -7505,6 +7505,10 @@ function testLockedObjects () {
window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOther = function (type, overlay) { window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOther = function (type, overlay) {
var currentSheetId = this.model.getId(), i, strokeColor, arrayCells, oCellTmp; var currentSheetId = this.model.getId(), i, strokeColor, arrayCells, oCellTmp;
if (!currentSheetId)
return;
if (AscCommon.c_oAscLockTypes.kLockTypeMine === type) { if (AscCommon.c_oAscLockTypes.kLockTypeMine === type) {
strokeColor = AscCommonExcel.c_oAscCoAuthoringMeBorderColor; strokeColor = AscCommonExcel.c_oAscCoAuthoringMeBorderColor;
arrayCells = this.collaborativeEditing.getLockCellsMe(currentSheetId); arrayCells = this.collaborativeEditing.getLockCellsMe(currentSheetId);
...@@ -7517,6 +7521,8 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth ...@@ -7517,6 +7521,8 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
} }
var sheetId = this.model.getId(); var sheetId = this.model.getId();
if (!sheetId)
return;
for (i = 0; i < arrayCells.length; ++i) { for (i = 0; i < arrayCells.length; ++i) {
...@@ -7552,6 +7558,9 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth ...@@ -7552,6 +7558,9 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsMeOth
window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLock = function (overlay) { window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLock = function (overlay) {
var currentSheetId = this.model.getId(); var currentSheetId = this.model.getId();
if (!currentSheetId)
return;
var nLockAllType = this.collaborativeEditing.isLockAllOther(currentSheetId); var nLockAllType = this.collaborativeEditing.isLockAllOther(currentSheetId);
if (Asc.c_oAscMouseMoveLockedObjectType.None !== nLockAllType) { if (Asc.c_oAscMouseMoveLockedObjectType.None !== nLockAllType) {
var isAllRange = true, strokeColor = (Asc.c_oAscMouseMoveLockedObjectType.TableProperties === nLockAllType) ? var isAllRange = true, strokeColor = (Asc.c_oAscMouseMoveLockedObjectType.TableProperties === nLockAllType) ?
...@@ -7560,6 +7569,10 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLo ...@@ -7560,6 +7569,10 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElementsAllLo
var left = this.cols[oAllRange.c1].left, top = this.rows[oAllRange.r1].top; var left = this.cols[oAllRange.c1].left, top = this.rows[oAllRange.r1].top;
var sheetId = this.model.getId();
if (!sheetId)
return;
var userId = ""; var userId = "";
var lockInfo = this.collaborativeEditing.getLockInfo(AscCommonExcel.c_oAscLockTypeElem.Range, var lockInfo = this.collaborativeEditing.getLockInfo(AscCommonExcel.c_oAscLockTypeElem.Range,
null, null,
......
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