Commit 8bd536df authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=26336 - Не пропадает кнопка автофильтра в...

http://bugzserver/show_bug.cgi?id=26336 - Не пропадает кнопка автофильтра в шапке после применения clear format

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64106 954022d7-b5bf-4e40-9824-e11837661b57
parent 1a39c291
......@@ -1212,6 +1212,19 @@ var maxIndividualValues = 10000;
History.EndTransaction();
},
cleanFormat: function(range)
{
var aWs = this._getCurrentWS();
if(aWs.AutoFilter && aWs.AutoFilter.Ref)
{
//if first row AF in ActiveRange - delete AF
var firstRowRange = new Asc.Range(aWs.AutoFilter.Ref.c1, aWs.AutoFilter.Ref.r1, aWs.AutoFilter.Ref.c2, aWs.AutoFilter.Ref.r1);
if(range.containsRange(firstRowRange))
this.isEmptyAutoFilters(aWs.AutoFilter.Ref);
}
},
isCheckMoveRange: function(arnFrom)
{
var aWs = this._getCurrentWS();
......
......@@ -8103,6 +8103,8 @@
// Если нужно удалить автофильтры - удаляем
if(val === c_oAscCleanOptions.All || val === c_oAscCleanOptions.Text)
t.autoFilters.isEmptyAutoFilters(arn);
else if(val === c_oAscCleanOptions.Format)
t.autoFilters.cleanFormat(arn);
if (val === c_oAscCleanOptions.All) {
range.cleanAll();
......
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