Commit 6124b106 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

поправил проблемы минимизации

Bug #31689

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68410 954022d7-b5bf-4e40-9824-e11837661b57
parent 87a5b279
...@@ -1568,23 +1568,23 @@ cStrucTable.prototype.createArea = function ( val, cell ) { ...@@ -1568,23 +1568,23 @@ cStrucTable.prototype.createArea = function ( val, cell ) {
function getColumnType( value ) { function getColumnType( value ) {
var res; var res;
switch ( value.toLowerCase() ) { switch ( value.toLowerCase() ) {
case "#"+cStrucTableLocalColumns.a.toLocaleLowerCase(): case "#"+cStrucTableLocalColumns['a'].toLocaleLowerCase():
case cStrucTableReservedWords.all.toLocaleLowerCase(): case cStrucTableReservedWords.all.toLocaleLowerCase():
res = g_nFormulaTablePartInfo.all; res = g_nFormulaTablePartInfo.all;
break; break;
case "#"+cStrucTableLocalColumns.d.toLocaleLowerCase(): case "#"+cStrucTableLocalColumns['d'].toLocaleLowerCase():
case cStrucTableReservedWords.data.toLocaleLowerCase(): case cStrucTableReservedWords.data.toLocaleLowerCase():
res = g_nFormulaTablePartInfo.data; res = g_nFormulaTablePartInfo.data;
break; break;
case "#"+cStrucTableLocalColumns.h.toLocaleLowerCase(): case "#"+cStrucTableLocalColumns['h'].toLocaleLowerCase():
case cStrucTableReservedWords.headers.toLocaleLowerCase(): case cStrucTableReservedWords.headers.toLocaleLowerCase():
res = g_nFormulaTablePartInfo.headers; res = g_nFormulaTablePartInfo.headers;
break; break;
case "#"+cStrucTableLocalColumns.t.toLocaleLowerCase(): case "#"+cStrucTableLocalColumns['t'].toLocaleLowerCase():
case cStrucTableReservedWords.totals.toLocaleLowerCase(): case cStrucTableReservedWords.totals.toLocaleLowerCase():
res = g_nFormulaTablePartInfo.totals; res = g_nFormulaTablePartInfo.totals;
break; break;
case "#"+cStrucTableLocalColumns.tr.toLocaleLowerCase(): case "#"+cStrucTableLocalColumns['tr'].toLocaleLowerCase():
case cStrucTableReservedWords.at.toLocaleLowerCase(): case cStrucTableReservedWords.at.toLocaleLowerCase():
case cStrucTableReservedWords.thisrow.toLocaleLowerCase(): case cStrucTableReservedWords.thisrow.toLocaleLowerCase():
res = g_nFormulaTablePartInfo.thisRow; res = g_nFormulaTablePartInfo.thisRow;
...@@ -1726,31 +1726,31 @@ cStrucTable.prototype.buildLocalTableString = function (reservedColumn,local) { ...@@ -1726,31 +1726,31 @@ cStrucTable.prototype.buildLocalTableString = function (reservedColumn,local) {
switch(reservedColumn){ switch(reservedColumn){
case g_nFormulaTablePartInfo.all:{ case g_nFormulaTablePartInfo.all:{
if(local) if(local)
return "#"+cStrucTableLocalColumns.a; return "#"+cStrucTableLocalColumns['a'];
return cStrucTableReservedWords.all; return cStrucTableReservedWords.all;
break; break;
} }
case g_nFormulaTablePartInfo.data:{ case g_nFormulaTablePartInfo.data:{
if(local) if(local)
return "#"+cStrucTableLocalColumns.d; return "#"+cStrucTableLocalColumns['d'];
return cStrucTableReservedWords.data; return cStrucTableReservedWords.data;
break; break;
} }
case g_nFormulaTablePartInfo.headers:{ case g_nFormulaTablePartInfo.headers:{
if(local) if(local)
return "#"+cStrucTableLocalColumns.h; return "#"+cStrucTableLocalColumns['h'];
return cStrucTableReservedWords.headers; return cStrucTableReservedWords.headers;
break; break;
} }
case g_nFormulaTablePartInfo.totals:{ case g_nFormulaTablePartInfo.totals:{
if(local) if(local)
return "#"+cStrucTableLocalColumns.t; return "#"+cStrucTableLocalColumns['t'];
return cStrucTableReservedWords.totals; return cStrucTableReservedWords.totals;
break; break;
} }
case g_nFormulaTablePartInfo.thisRow:{ case g_nFormulaTablePartInfo.thisRow:{
if(local) if(local)
return "#"+cStrucTableLocalColumns.tr; return "#"+cStrucTableLocalColumns['tr'];
return cStrucTableReservedWords.thisrow; return cStrucTableReservedWords.thisrow;
break; break;
} }
......
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