Commit d10bcaaf authored by GoshaZotov's avatar GoshaZotov

add const in c_oAscError(FTChangeTableRangeError, FTRangeIncludedOtherTables)

parent 38d59d72
...@@ -82,6 +82,8 @@ var c_oAscError = { ...@@ -82,6 +82,8 @@ var c_oAscError = {
AutoFilterMoveToHiddenRangeError: -53, AutoFilterMoveToHiddenRangeError: -53,
LockedAllError: -54, LockedAllError: -54,
LockedWorksheetRename: -55, LockedWorksheetRename: -55,
FTChangeTableRangeError: -56,
FTRangeIncludedOtherTables: -57,
PasteMaxRangeError: -65, PasteMaxRangeError: -65,
......
...@@ -13215,18 +13215,17 @@ ...@@ -13215,18 +13215,17 @@
var ws = this.model; var ws = this.model;
var intersectionTables = this.model.autoFilters.getTableIntersectionRange(range); var intersectionTables = this.model.autoFilters.getTableIntersectionRange(range);
if(!intersectionTables || (intersectionTables && intersectionTables.length !== 1)) var tablePart = intersectionTables[0];
if(tablePart)
{ {
res = c_oAscError.ID.AutoFilterMoveToHiddenRangeError; if(range.r1 !== tablePart.Ref.r1)//первая строка таблицы не равно первой строке выделенного диапазона
}
else
{
var tablePart = intersectionTables[0];
if(range.r1 !== tablePart.Ref.r1)
{ {
res = c_oAscError.ID.AutoFilterMoveToHiddenRangeError; res = c_oAscError.ID.FTChangeTableRangeError;
}
else if(intersectionTables.length !== 1)//выделено несколько таблиц
{
res = c_oAscError.ID.FTRangeIncludedOtherTables;
} }
} }
return res; return res;
......
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