Commit 5903e038 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

При открытии документа Microsoft (Demo-2012SummerOlympics).xlsx не было...

При открытии документа Microsoft (Demo-2012SummerOlympics).xlsx не было бордеров (пропадали бордеры после скрытого столбца, в котором нет бордеров).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55433 954022d7-b5bf-4e40-9824-e11837661b57
parent 122ea221
......@@ -2775,6 +2775,7 @@
var arrCurrRow = [];
var arrNextRow = [];
var bCur, bPrev, bNext, bTopCur, bTopPrev, bTopNext, bBotCur, bBotPrev, bBotNext;
bCur = bPrev = bNext = bTopCur = bTopPrev = bTopNext = bBotCur = bBotPrev = bBotNext = undefined;
var row = range.r1 - 1, col, prevCol = range.c1 - 1;
// Сначала пройдемся по верхней строке (над отрисовываемым диапазоном)
while (0 <= row) {
......@@ -2791,7 +2792,7 @@
while (0 <= prevCol && c[prevCol].width < t.width_1px)
--prevCol;
var mc, isMerged;
var mc = undefined, isMerged;
var isPrevColExist = (0 <= prevCol);
for (row = range.r1; row <= range.r2 && row < t.nRowsCount; ++row) {
if (r[row].height < t.height_1px) {continue;}
......@@ -2803,11 +2804,14 @@
var y1 = r[row].top - offsetY;
var y2 = y1 + r[row].height - this.height_1px;
for (col = range.c1, isMerged = false; col <= range.c2 && col < t.nColsCount; ++col, isMerged = false) {
var nextCol;
for (col = range.c1, isMerged = false; col <= range.c2 && col < t.nColsCount; col = nextCol, isMerged = false) {
if (c[col].width < this.width_1px) {continue;}
var isFirstCol = col === range.c1;
var isLastCol = col === range.c2;
var nextCol = col + 1;
// Нужно отсеять пустые справа
for (nextCol = col + 1; nextCol <= range.c2 && nextCol < t.nColsCount; ++nextCol)
if (c[nextCol].width >= this.width_1px) {break;}
if (mc && mc.c2 >= col) {
isMerged = true;
......
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