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

+ к rev.64279

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64288 954022d7-b5bf-4e40-9824-e11837661b57
parent 5dcaf8f1
...@@ -3088,7 +3088,7 @@ var maxIndividualValues = 10000; ...@@ -3088,7 +3088,7 @@ var maxIndividualValues = 10000;
{ {
cell = aWs.getCell3(row, col); cell = aWs.getCell3(row, col);
var isMerged = cell.hasMerged(); var isMerged = cell.hasMerged();
var isMergedAllRow = (isMerged.c2 + 1 == gc_nMaxCol && isMerged.c1 === 0) ? true : false;//если замержена вся ячейка var isMergedAllRow = (isMerged && isMerged.c2 + 1 == gc_nMaxCol && isMerged.c1 === 0) ? true : false;//если замержена вся ячейка
if((isMerged && isMerged.c2 != col && !isMergedAllRow) || (isMergedAllRow && col !== ref.c1)) if((isMerged && isMerged.c2 != col && !isMergedAllRow) || (isMergedAllRow && col !== ref.c1))
{ {
......
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