Commit 236359aa authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 34678

parent 1932e924
......@@ -1077,8 +1077,8 @@
if (undefined !== ct.userIdAllSheet) {
arrMouseMoveObjects.push(new asc_CMM({
type: c_oAscMouseMoveType.LockedObject,
x: ct.lockAllPosLeft,
y: ct.lockAllPosTop,
x: AscCommon.AscBrowser.convertToRetinaValue(ct.lockAllPosLeft),
y: AscCommon.AscBrowser.convertToRetinaValue(ct.lockAllPosTop),
userId: ct.userIdAllSheet,
lockedObjectType: Asc.c_oAscMouseMoveLockedObjectType.Sheet
}));
......@@ -1087,8 +1087,8 @@
if (undefined !== ct.userIdAllProps) {
arrMouseMoveObjects.push(new asc_CMM({
type: c_oAscMouseMoveType.LockedObject,
x: ct.lockAllPosLeft,
y: ct.lockAllPosTop,
x: AscCommon.AscBrowser.convertToRetinaValue(ct.lockAllPosLeft),
y: AscCommon.AscBrowser.convertToRetinaValue(ct.lockAllPosTop),
userId: ct.userIdAllProps,
lockedObjectType: Asc.c_oAscMouseMoveLockedObjectType.TableProperties
}));
......@@ -1098,8 +1098,8 @@
if (undefined !== ct.userId) {
arrMouseMoveObjects.push(new asc_CMM({
type: c_oAscMouseMoveType.LockedObject,
x: ct.lockRangePosLeft,
y: ct.lockRangePosTop,
x: AscCommon.AscBrowser.convertToRetinaValue(ct.lockRangePosLeft),
y: AscCommon.AscBrowser.convertToRetinaValue(ct.lockRangePosTop),
userId: ct.userId,
lockedObjectType: Asc.c_oAscMouseMoveLockedObjectType.Range
}));
......@@ -1123,7 +1123,10 @@
ct.cursor = ct.cellCursor.cursor;
}
arrMouseMoveObjects.push(new asc_CMM({
type: c_oAscMouseMoveType.Hyperlink, x: x, y: y, hyperlink: ct.hyperlink
type: c_oAscMouseMoveType.Hyperlink,
x: AscCommon.AscBrowser.convertToRetinaValue(x),
y: AscCommon.AscBrowser.convertToRetinaValue(y),
hyperlink: ct.hyperlink
}));
}
......
......@@ -6038,7 +6038,8 @@
this.handlers.trigger("checkLastWork");
var res, c, r, f, i, offsetX, offsetY, cellCursor;
var sheetId = this.model.getId(), userId, lockRangePosLeft, lockRangePosTop, lockInfo, oHyperlink;
var widthDiff = 0, heightDiff = 0, isLocked = false, target = c_oTargetType.Cells, row = -1, col = -1, isSelGraphicObject, isNotFirst;
var widthDiff = 0, heightDiff = 0, isLocked = false, target = c_oTargetType.Cells, row = -1, col = -1,
isSelGraphicObject, isNotFirst;
if (c_oAscSelectionDialogType.None === this.selectionDialogType) {
var frozenCursor = this._isFrozenAnchor(x, y);
......@@ -6232,7 +6233,8 @@
var isIntersection = this._recalcRangeByInsertRowsAndColumns(sheetId, selectRangeRecalc);
if (false === isIntersection) {
lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Range, /*subType*/null, sheetId,
new AscCommonExcel.asc_CCollaborativeRange(selectRangeRecalc.c1, selectRangeRecalc.r1, selectRangeRecalc.c2, selectRangeRecalc.r2));
new AscCommonExcel.asc_CCollaborativeRange(selectRangeRecalc.c1, selectRangeRecalc.r1,
selectRangeRecalc.c2, selectRangeRecalc.r2));
isLocked = this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther,
/*bCheckOnlyLockAll*/false);
if (false !== isLocked) {
......
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