Commit 98e2e4a8 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

поправил зависание Microsoft (Demo-2012SummerOlympics).xlsx

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50420 954022d7-b5bf-4e40-9824-e11837661b57
parent 13419381
...@@ -1147,7 +1147,7 @@ ...@@ -1147,7 +1147,7 @@
//устанавливаем стиль для таблицы //устанавливаем стиль для таблицы
if(!isAll && openFilter != undefined) if(!isAll && openFilter != undefined)
{ {
this._setColorStyleTable(result[0].id, result[result.length -1].idNext, aWs.TableParts[openFilter], null, true); this._setColorStyleTable(result[0].id, result[result.length -1].idNext, aWs.TableParts[openFilter]);
var firstCell = ws.model.getCell(new CellAddress((result[0].id))); var firstCell = ws.model.getCell(new CellAddress((result[0].id)));
var endCell = ws.model.getCell(new CellAddress((result[result.length -1].idNext))); var endCell = ws.model.getCell(new CellAddress((result[result.length -1].idNext)));
var arn = var arn =
...@@ -3202,10 +3202,10 @@ ...@@ -3202,10 +3202,10 @@
//заполняем названия столбцов //заполняем названия столбцов
if(true != isOpenFilter && headerRowCount > 0 && options.TableColumns) if(true != isOpenFilter && headerRowCount > 0 && options.TableColumns)
{ {
for(var i = bbox.c1; i <= bbox.c2; i++) for(var ncol = bbox.c1; ncol <= bbox.c2; ncol++)
{ {
var range = ws.model.getCell3(bbox.r1, i); var range = ws.model.getCell3(bbox.r1, ncol);
var num = i - bbox.c1; var num = ncol - bbox.c1;
var tableColumn = options.TableColumns[num]; var tableColumn = options.TableColumns[num];
if(null != tableColumn && null != tableColumn.Name && !startRedo && isSetVal) if(null != tableColumn && null != tableColumn.Name && !startRedo && isSetVal)
{ {
......
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