Commit 10933d9a authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Получение MergedCellsRange перенес в if для border-ов (для ускорения). Баг...

Получение MergedCellsRange перенес в if для border-ов (для ускорения). Баг http://bugzserver/show_bug.cgi?id=20388

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49881 954022d7-b5bf-4e40-9824-e11837661b57
parent 6de0170a
......@@ -4055,11 +4055,12 @@
isActive !== undefined ? isActive : false);
}
var cc = self._fetchCellCache(col, row),
cb = cc.borders = ( cc.borders || {} ),
mc = this._getMergedCellsRange(col, row);
var cc = self._fetchCellCache(col, row);
var cb = cc.borders = ( cc.borders || {} );
var mc;
if (!cb.l || !cb.r || !cb.t || !cb.b || !cb.dd || !cb.du) {
mc = this._getMergedCellsRange(col, row);
var b = self._getVisibleCell(col, row).getBorder();
if (!cb.l) {cb.l = !mc || col === mc.c1 ? makeBorder(b, kcbidLeft) : new CellBorder();}
if (!cb.r) {cb.r = !mc || col === mc.c2 ? makeBorder(b, kcbidRight) : new CellBorder();}
......
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