Commit 9cd3c22d authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

при передачи шаблонов форматированных таблиц добавил displayNameя

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47925 954022d7-b5bf-4e40-9824-e11837661b57
parent 571af57b
...@@ -1536,6 +1536,7 @@ ...@@ -1536,6 +1536,7 @@
result[n] = result[n] =
{ {
name: i, name: i,
displayName: i,
type: 'custom', type: 'custom',
image: this._drawSmallIconTable(canvas,customStyles[i]) image: this._drawSmallIconTable(canvas,customStyles[i])
}; };
...@@ -1553,6 +1554,7 @@ ...@@ -1553,6 +1554,7 @@
result[n] = result[n] =
{ {
name: i, name: i,
displayName: i,
type: 'default', type: 'default',
image: this._drawSmallIconTable(canvas,defaultStyles[i]) image: this._drawSmallIconTable(canvas,defaultStyles[i])
}; };
...@@ -3528,6 +3530,9 @@ ...@@ -3528,6 +3530,9 @@
var isBlank = filter.Filters.Blank; var isBlank = filter.Filters.Blank;
for(var m = startCell.r1 + 1; m <= endCell.r1; m++) for(var m = startCell.r1 + 1; m <= endCell.r1; m++)
{ {
if(!filter.ShowButton)
{
}
var val = ws.model.getCell( new CellAddress(m, startCell.c1, 0)).getCells()[0].getValue(); var val = ws.model.getCell( new CellAddress(m, startCell.c1, 0)).getCells()[0].getValue();
var isVis = false; var isVis = false;
for(var k = 0; k < customFilter.length;k++) for(var k = 0; k < customFilter.length;k++)
......
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