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

_getMergedCellsRange на getMergedByCell

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50435 954022d7-b5bf-4e40-9824-e11837661b57
parent 4431dab8
......@@ -515,9 +515,8 @@
if (ar.c1 === ar.c2 && ar.r1 === ar.r2)
isHyperlinkClick = true;
else {
var mergedRange = ws._getMergedCellsRange(ar.c1, ar.r1);
if (mergedRange && mergedRange.c1 === ar.c1 && mergedRange.c2 === ar.c2 &&
mergedRange.r1 === ar.r1 && mergedRange.r2 === ar.r2)
var mergedRange = this.model.getMergedByCell(ar.r1, ar.c1);
if (mergedRange && ar.isEqual(mergedRange))
isHyperlinkClick = true;
}
if (isHyperlinkClick) {
......
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