getMergedByCell возвращает null или asc_range

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50432 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/Workbook.js

@@ -4052,8 +4052,9 @@ Woorksheet.prototype.getHyperlinkByCell = function(row, col){
 	return oHyperlink ? oHyperlink.data : null;
 };
 Woorksheet.prototype.getMergedByCell = function(row, col){
-	return this.mergeManager.getByCell(row, col);
-}
+	var oMergeInfo = this.mergeManager.getByCell(row, col);
+	return oMergeInfo ? oMergeInfo.bbox : null;
+};
 Woorksheet.prototype._expandRangeByMergedAddToOuter = function(aOuter, range, aMerged){
 	for(var i = 0, length = aMerged.all.length; i < length; i++)
 	{