Commit 967d25c9 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

fix:

 Bug 29785 - [NamedRanges] Удаление листа или его копии, содержащего форматированную таблицу, не происходит и вызывает ошибку в консоли (http://bugzserver/show_bug.cgi?id=29785)
 Bug 29929 - [NamedRanges] Ошибка в консоли при удаление именованного диапазона со сдвигом, к элементам которого обращались (http://bugzserver/show_bug.cgi?id=29929)
 Bug 29944 - [NamedRanges][CoEdit] Ошибка в консоли при передаче именованного диапазона (http://bugzserver/show_bug.cgi?id=29944)
 Bug 29932 - [NamedRanges] Именованный диапазон форматированной таблицы содержит ее заголовок (http://bugzserver/show_bug.cgi?id=29932)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63943 954022d7-b5bf-4e40-9824-e11837661b57
parent 0b64fe44
This diff is collapsed.
...@@ -1581,13 +1581,15 @@ var g_oUndoRedoData_DefinedNamesProperties = { ...@@ -1581,13 +1581,15 @@ var g_oUndoRedoData_DefinedNamesProperties = {
Name: 0, Name: 0,
Ref:1, Ref:1,
LocalSheetId:2, LocalSheetId:2,
slaveEdge:3 slaveEdge:3,
isTable:4
}; };
function UndoRedoData_DefinedNames(name, ref, scope, slaveEdge){ function UndoRedoData_DefinedNames(name, ref, scope, isTable, slaveEdge){
this.Properties = g_oUndoRedoData_DefinedNamesProperties; this.Properties = g_oUndoRedoData_DefinedNamesProperties;
this.Name = name; this.Name = name;
this.Ref = ref; this.Ref = ref;
this.LocalSheetId = scope; this.LocalSheetId = scope;
this.isTable = isTable;
this.slaveEdge = slaveEdge; this.slaveEdge = slaveEdge;
} }
UndoRedoData_DefinedNames.prototype = { UndoRedoData_DefinedNames.prototype = {
...@@ -1606,6 +1608,7 @@ UndoRedoData_DefinedNames.prototype = { ...@@ -1606,6 +1608,7 @@ UndoRedoData_DefinedNames.prototype = {
case this.Properties.Name: return this.Name;break; case this.Properties.Name: return this.Name;break;
case this.Properties.Ref: return this.Ref;break; case this.Properties.Ref: return this.Ref;break;
case this.Properties.LocalSheetId: return this.LocalSheetId;break; case this.Properties.LocalSheetId: return this.LocalSheetId;break;
case this.Properties.isTable: return this.isTable;break;
case this.Properties.slaveEdge: return this.slaveEdge;break; case this.Properties.slaveEdge: return this.slaveEdge;break;
} }
return null; return null;
...@@ -1617,6 +1620,7 @@ UndoRedoData_DefinedNames.prototype = { ...@@ -1617,6 +1620,7 @@ UndoRedoData_DefinedNames.prototype = {
case this.Properties.Name: this.Name = value;break; case this.Properties.Name: this.Name = value;break;
case this.Properties.Ref: this.Ref = value;break; case this.Properties.Ref: this.Ref = value;break;
case this.Properties.LocalSheetId: this.LocalSheetId = value;break; case this.Properties.LocalSheetId: this.LocalSheetId = value;break;
case this.Properties.isTable: this.isTable = value;break;
case this.Properties.slaveEdge: this.slaveEdge = value;break; case this.Properties.slaveEdge: this.slaveEdge = value;break;
} }
} }
...@@ -1628,8 +1632,8 @@ var g_oUndoRedoData_DefinedNamesChangeProperties = { ...@@ -1628,8 +1632,8 @@ var g_oUndoRedoData_DefinedNamesChangeProperties = {
}; };
function UndoRedoData_DefinedNamesChange(oldName, newName){ function UndoRedoData_DefinedNamesChange(oldName, newName){
this.Properties = g_oUndoRedoData_DefinedNamesChangeProperties; this.Properties = g_oUndoRedoData_DefinedNamesChangeProperties;
this.oldName = oldName; this.oldName = oldName?new UndoRedoData_DefinedNames(oldName.Name, oldName.Ref, oldName.LocalSheetId, oldName.isTable, null):undefined;
this.newName = newName; this.newName = newName?new UndoRedoData_DefinedNames(newName.Name, newName.Ref, newName.LocalSheetId, newName.isTable, null):undefined;
} }
UndoRedoData_DefinedNamesChange.prototype = { UndoRedoData_DefinedNamesChange.prototype = {
getType : function() getType : function()
......
This diff is collapsed.
...@@ -4349,7 +4349,7 @@ TablePart.prototype.clone = function(ws) { ...@@ -4349,7 +4349,7 @@ TablePart.prototype.clone = function(ws) {
TablePart.prototype.recalc = function(ws) { TablePart.prototype.recalc = function(ws) {
this.DisplayName = ws.workbook.dependencyFormulas.getNextTableName(ws, this.Ref); this.DisplayName = ws.workbook.dependencyFormulas.getNextTableName(ws, this.Ref);
}; };
TablePart.prototype.moveRef = function(col, row, ws) { TablePart.prototype.moveRef = function(col, row) {
var ref = this.Ref.clone(); var ref = this.Ref.clone();
ref.setOffset({offsetCol: col ? col : 0, offsetRow: row ? row : 0}); ref.setOffset({offsetCol: col ? col : 0, offsetRow: row ? row : 0});
......
...@@ -1686,7 +1686,7 @@ var maxIndividualValues = 10000; ...@@ -1686,7 +1686,7 @@ var maxIndividualValues = 10000;
range = ref; range = ref;
//move ref //move ref
findFilters[i].moveRef(diffCol, diffRow, ws); findFilters[i].moveRef(diffCol, diffRow);
isUpdate = false; isUpdate = false;
if((findFilters[i].AutoFilter && findFilters[i].AutoFilter.FilterColumns && findFilters[i].AutoFilter.FilterColumns.length) || (findFilters[i].FilterColumns && findFilters[i].FilterColumns.length)) if((findFilters[i].AutoFilter && findFilters[i].AutoFilter.FilterColumns && findFilters[i].AutoFilter.FilterColumns.length) || (findFilters[i].FilterColumns && findFilters[i].FilterColumns.length))
......
...@@ -380,6 +380,44 @@ ...@@ -380,6 +380,44 @@
return sRes; return sRes;
}, },
getAbsName2 : function(absCol1,absRow1,absCol2,absRow2) {
var sRes = "";
if (0 == this.c1 && gc_nMaxCol0 == this.c2 && false == this.c1Abs && false == this.c2Abs) {
if (absRow1)
sRes += "$";
sRes += (this.r1 + 1) + ":";
if (absRow2)
sRes += "$";
sRes += (this.r2 + 1);
}
else if (0 == this.r1 && gc_nMaxRow0 == this.r2 && false == this.r1Abs && false == this.r2Abs) {
if (absCol1)
sRes += "$";
sRes += g_oCellAddressUtils.colnumToColstr(this.c1 + 1) + ":";
if (absCol2)
sRes += "$";
sRes += g_oCellAddressUtils.colnumToColstr(this.c2 + 1);
}
else {
if (absCol1)
sRes += "$";
sRes += g_oCellAddressUtils.colnumToColstr(this.c1 + 1);
if (absRow1)
sRes += "$";
sRes += (this.r1 + 1);
if (!this.isOneCell()) {
sRes += ":";
if (absCol2)
sRes += "$";
sRes += g_oCellAddressUtils.colnumToColstr(this.c2 + 1);
if (absRow2)
sRes += "$";
sRes += (this.r2 + 1);
}
}
return sRes;
},
getAllRange: function () { getAllRange: function () {
var result; var result;
if (c_oAscSelectionType.RangeMax === this.type) if (c_oAscSelectionType.RangeMax === this.type)
......
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