Commit b680e107 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал лишнее получение свойств

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54639 954022d7-b5bf-4e40-9824-e11837661b57
parent f23813f4
......@@ -4406,8 +4406,7 @@
var c = row !== undefined ? this._getCell(col, row) : col;
if (undefined === c)
return true;
var fl = this._getCellFlags(c);
if (fl.isMerged)
if (null !== c.hasMerged())
return false;
return c.getValue().search(/[^ ]/) < 0;
};
......@@ -4416,8 +4415,7 @@
var c = row !== undefined ? this._getCell(col, row) : col;
if (undefined === c)
return true;
var fl = this._getCellFlags(c);
if (fl.isMerged)
if (null !== c.hasMerged())
return false;
var bg = c.getFill();
if (null !== bg)
......
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