Commit 770868af authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=26433 - [CoEdit][copy&paste] Появления...

http://bugzserver/show_bug.cgi?id=26433 - [CoEdit][copy&paste] Появления кнопок автофильтра в таблице после вставки форматированной таблицы без фильтра

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64113 954022d7-b5bf-4e40-9824-e11837661b57
parent d01a5dfe
...@@ -260,15 +260,11 @@ var maxIndividualValues = 10000; ...@@ -260,15 +260,11 @@ var maxIndividualValues = 10000;
constructor: AutoFilters, constructor: AutoFilters,
addAutoFilter: function(styleName, activeRange, addFormatTableOptionsObj, offLock) addAutoFilter: function(styleName, activeRange, addFormatTableOptionsObj, offLock, bWithoutFilter)
{ {
var aWs = this._getCurrentWS(), addNameColumn, filterRange, t = this, ws = this.worksheet, cloneFilter; var aWs = this._getCurrentWS(), addNameColumn, filterRange, t = this, ws = this.worksheet, cloneFilter;
var isTurnOffHistory = aWs.workbook.bUndoChanges || aWs.workbook.bRedoChanges; var isTurnOffHistory = aWs.workbook.bUndoChanges || aWs.workbook.bRedoChanges;
var bWithoutFilter = false;//TODO изменить переменную
var tempRange = new Asc.Range(activeRange.c1, activeRange.r1, activeRange.c2, activeRange.r2); var tempRange = new Asc.Range(activeRange.c1, activeRange.r1, activeRange.c2, activeRange.r2);
if(addFormatTableOptionsObj === false) if(addFormatTableOptionsObj === false)
addNameColumn = true; addNameColumn = true;
...@@ -949,7 +945,7 @@ var maxIndividualValues = 10000; ...@@ -949,7 +945,7 @@ var maxIndividualValues = 10000;
History.TurnOff(); History.TurnOff();
switch (type) { switch (type) {
case historyitem_AutoFilter_Add: case historyitem_AutoFilter_Add:
this.addAutoFilter(data.styleName, data.activeCells, data.addFormatTableOptionsObj, data.bWithoutFilter); this.addAutoFilter(data.styleName, data.activeCells, data.addFormatTableOptionsObj, null, data.bWithoutFilter);
break; break;
case historyitem_AutoFilter_Delete: case historyitem_AutoFilter_Delete:
this.deleteAutoFilter(data.activeCells); this.deleteAutoFilter(data.activeCells);
......
...@@ -8289,7 +8289,7 @@ ...@@ -8289,7 +8289,7 @@
if(!aFilters[aF].AutoFilter) if(!aFilters[aF].AutoFilter)
bWithoutFilter = true; bWithoutFilter = true;
t.autoFilters.addAutoFilter(aFilters[aF].TableStyleInfo.Name, range.bbox, true); t.autoFilters.addAutoFilter(aFilters[aF].TableStyleInfo.Name, range.bbox, true, null, bWithoutFilter);
} }
} }
......
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