Commit 95f2d1b7 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

если выделен граф.объект, то не показывать курсор для перемещения и ресайса диапазона

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51519 954022d7-b5bf-4e40-9824-e11837661b57
parent 3d8de412
......@@ -3671,6 +3671,7 @@ function DrawingObjects() {
}
worksheet.model.workbook.handlers.trigger("asc_onEndAction", c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
worksheet.setSelectionShape(true);
}
if (null != _image) {
......@@ -3735,7 +3736,9 @@ function DrawingObjects() {
if ( _this.isViewerMode() )
return;
worksheet.setSelectionShape(true);
if ( chart instanceof asc_CChart ) {
var _range = convertFormula(chart.range.interval, worksheet);
if ( _range )
......
......@@ -5093,7 +5093,8 @@
x >= (this.fillHandleL - fillHandleEpsilon) && x <= (this.fillHandleR + fillHandleEpsilon) &&
y >= (this.fillHandleT - fillHandleEpsilon) && y <= (this.fillHandleB + fillHandleEpsilon)) {
// Мы на "квадрате" для автозаполнения
return {cursor: kCurFillHandle, target: "fillhandle", col: -1, row: -1};
if ( !this.objectRender.selectedGraphicObjectsExists() )
return {cursor: kCurFillHandle, target: "fillhandle", col: -1, row: -1};
}
var xWithOffset = x + offsetX;
......@@ -5114,7 +5115,8 @@
(null !== bottom && yWithOffset >= bottom - this.height_2px && yWithOffset <= bottom + this.height_2px)) &&
null !== left && null !== right && xWithOffset >= left - this.width_2px && xWithOffset <= right + this.width_2px))) {
// Мы навели на границу выделения
return {cursor: kCurMove, target: "moveRange", col: -1, row: -1};
if ( !this.objectRender.selectedGraphicObjectsExists() )
return {cursor: kCurMove, target: "moveRange", col: -1, row: -1};
}
}
......
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