Fix Bug 59625
This commit is contained in:
parent
5067a87300
commit
36b461f6e1
|
@ -2054,7 +2054,7 @@ define([
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
shortcuts['command+shift+=,ctrl+shift+=' + (Common.Utils.isGecko ? ',command+shift+ff=,ctrl+shift+ff=' : '')] = function(e) {
|
shortcuts['command+shift+=,ctrl+shift+=' + (Common.Utils.isGecko ? ',command+shift+ff=,ctrl+shift+ff=' : '')] = function(e) {
|
||||||
if (me.editMode && !me.toolbar.btnAddCell.isDisabled()) {
|
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnAddCell.isDisabled()) {
|
||||||
var cellinfo = me.api.asc_getCellInfo(),
|
var cellinfo = me.api.asc_getCellInfo(),
|
||||||
selectionType = cellinfo.asc_getSelectionType();
|
selectionType = cellinfo.asc_getSelectionType();
|
||||||
if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) {
|
if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) {
|
||||||
|
@ -2085,7 +2085,7 @@ define([
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
shortcuts['command+shift+-,ctrl+shift+-' + (Common.Utils.isGecko ? ',command+shift+ff-,ctrl+shift+ff-' : '')] = function(e) {
|
shortcuts['command+shift+-,ctrl+shift+-' + (Common.Utils.isGecko ? ',command+shift+ff-,ctrl+shift+ff-' : '')] = function(e) {
|
||||||
if (me.editMode && !me.toolbar.btnDeleteCell.isDisabled()) {
|
if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.toolbar.mode.isEditOle && !me.toolbar.btnDeleteCell.isDisabled()) {
|
||||||
var cellinfo = me.api.asc_getCellInfo(),
|
var cellinfo = me.api.asc_getCellInfo(),
|
||||||
selectionType = cellinfo.asc_getSelectionType();
|
selectionType = cellinfo.asc_getSelectionType();
|
||||||
if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) {
|
if (selectionType === Asc.c_oAscSelectionType.RangeRow || selectionType === Asc.c_oAscSelectionType.RangeCol) {
|
||||||
|
|
Loading…
Reference in a new issue