Commit 86315a17 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

имена для автофильтров

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63332 954022d7-b5bf-4e40-9824-e11837661b57
parent 535fa118
...@@ -1050,6 +1050,10 @@ DependencyGraph.prototype = { ...@@ -1050,6 +1050,10 @@ DependencyGraph.prototype = {
changeTableName:function(tableName, ws, newRef){ changeTableName:function(tableName, ws, newRef){
var table = this.getDefNameNodeByName( tableName, ws ); var table = this.getDefNameNodeByName( tableName, ws );
table.Ref = parserHelp.getEscapeSheetName(ws.getName())+"!"+newRef.getAbsName(); table.Ref = parserHelp.getEscapeSheetName(ws.getName())+"!"+newRef.getAbsName();
},
delTableName:function(name,ws){
var table = this.getDefNameNodeByName( name, ws );
table.Ref = null;
} }
}; };
......
...@@ -1025,7 +1025,7 @@ var maxIndividualValues = 10000; ...@@ -1025,7 +1025,7 @@ var maxIndividualValues = 10000;
if(!aWs.TableParts) if(!aWs.TableParts)
aWs.TableParts = []; aWs.TableParts = [];
aWs.TableParts[aWs.TableParts.length] = cloneData; aWs.TableParts[aWs.TableParts.length] = cloneData;
aWs.workbook.dependencyFormulas.addTableName(cloneData.DisplayName, aWs, cloneData.Ref);
this._setColorStyleTable(cloneData.Ref, cloneData, null, true); this._setColorStyleTable(cloneData.Ref, cloneData, null, true);
} }
else else
...@@ -1176,10 +1176,13 @@ var maxIndividualValues = 10000; ...@@ -1176,10 +1176,13 @@ var maxIndividualValues = 10000;
aWs.setRowHidden(false, bbox.r1, bbox.r2); aWs.setRowHidden(false, bbox.r1, bbox.r2);
//заносим в историю //заносим в историю
if(isTablePart) if(isTablePart){
t._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, deleteFilterAfterDeleteColRow, bbox); t._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, deleteFilterAfterDeleteColRow, bbox);
}
else else
t._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, null, oldFilter.Ref); t._addHistoryObj(oldFilter, historyitem_AutoFilter_Empty, {activeCells: activeCells}, null, oldFilter.Ref);
aWs.workbook.dependencyFormulas.delTableName(oldFilter.DisplayName,aWs.getName())
} }
else else
return oldFilter; return oldFilter;
......
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