Commit 65df0964 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

Bug #31955 - [AutoSave]Ошибка в консоли и бесконечная загрузка книги после...

Bug #31955 - [AutoSave]Ошибка в консоли и бесконечная загрузка книги после очистки формата форматированной таблицы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68856 954022d7-b5bf-4e40-9824-e11837661b57
parent 571756a2
......@@ -451,8 +451,11 @@ var maxIndividualValues = 10000;
History.StartTransaction();
cloneFilter = isTablePartsContainsRange.clone(null);
if(!isTablePartsContainsRange.TableStyleInfo)
isTablePartsContainsRange.TableStyleInfo = new TableStyleInfo();
isTablePartsContainsRange.TableStyleInfo.Name = styleName;
t._setColorStyleTable(isTablePartsContainsRange.Ref, isTablePartsContainsRange);
ws._onUpdateFormatTable(isTablePartsContainsRange.Ref, false, true);
......@@ -1342,8 +1345,10 @@ var maxIndividualValues = 10000;
for(var i = 0; i < selectedTableParts.length; i++)
{
var cloneFilter = selectedTableParts[i].clone(null);
selectedTableParts[i].TableStyleInfo.Name = null;
if(selectedTableParts[i].TableStyleInfo)
selectedTableParts[i].TableStyleInfo.Name = null;
t._cleanStyleTable(selectedTableParts[i].Ref);
t._addHistoryObj(cloneFilter, historyitem_AutoFilter_CleanFormat, {activeCells: range});
......@@ -4460,7 +4465,7 @@ var maxIndividualValues = 10000;
if((bbox.c2 - bbox.c1) > maxValCol)
bbox.c2 = bbox.c1 + maxValCol;
var style = options.TableStyleInfo.clone();
var style = options.TableStyleInfo ? options.TableStyleInfo.clone() : null;
var styleForCurTable;
//todo из файла
var headerRowCount = 1;
......
......@@ -7182,7 +7182,7 @@
var curTablePart = tablePartsOptions >= 0 ? this.model.TableParts[tablePartsOptions] : null;
cell_info.autoFilterInfo = new asc_CAutoFilterInfo();
cell_info.autoFilterInfo.tableStyleName = curTablePart ? curTablePart.TableStyleInfo.Name : null;
cell_info.autoFilterInfo.tableStyleName = curTablePart && curTablePart.TableStyleInfo ? curTablePart.TableStyleInfo.Name : null;
cell_info.autoFilterInfo.tableName = curTablePart ? curTablePart.DisplayName : null;
if ( -2 === tablePartsOptions ) {
cell_info.autoFilterInfo.isAutoFilter = null;
......
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