Commit 9598ed68 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил проверку на число столбцов. Баг http://bugzserver/show_bug.cgi?id=27458

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59520 954022d7-b5bf-4e40-9824-e11837661b57
parent 3272c457
......@@ -4297,7 +4297,7 @@
}
} else {
// Замерженная ячейка, нужна сумма столбцов
for (var i = mc.c1; i <= mc.c2 && i < this.nColsCount; ++i) {
for (var i = mc.c1; i <= mc.c2 && i < this.cols.length; ++i) {
colWidth += this.cols[i].width;
dDigitsCount += this.cols[i].charCount;
}
......@@ -4431,7 +4431,7 @@
if (null === mc) {return this.cols[col].innerWidth;}
var width = this.cols[mc.c1].innerWidth;
for (var c = mc.c1 + 1; c <= mc.c2 && c < this.nColsCount; ++c) {
for (var c = mc.c1 + 1; c <= mc.c2 && c < this.cols.length; ++c) {
width += this.cols[c].width;
}
return width;
......
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