Commit 10396921 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander.Trofimov

если скопировать стиль с merge ячейки, на merge ячейку меньшего размера, то был unmerge

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63277 954022d7-b5bf-4e40-9824-e11837661b57
parent f4f92020
...@@ -8636,8 +8636,14 @@ Range.prototype._promoteFromTo=function(from, to, bIsPromote, oCanPromote, bCtrl ...@@ -8636,8 +8636,14 @@ Range.prototype._promoteFromTo=function(from, to, bIsPromote, oCanPromote, bCtrl
for (var k = 0, length3 = oMergedFrom.all.length; k < length3; k++) { for (var k = 0, length3 = oMergedFrom.all.length; k < length3; k++) {
var oMergedBBox = oMergedFrom.all[k].bbox; var oMergedBBox = oMergedFrom.all[k].bbox;
var oNewMerged = Asc.Range(i + oMergedBBox.c1 - from.c1, j + oMergedBBox.r1 - from.r1, i + oMergedBBox.c2 - from.c1, j + oMergedBBox.r2 - from.r1); var oNewMerged = Asc.Range(i + oMergedBBox.c1 - from.c1, j + oMergedBBox.r1 - from.r1, i + oMergedBBox.c2 - from.c1, j + oMergedBBox.r2 - from.r1);
if (to.containsRange(oNewMerged)) if(to.contains(oNewMerged.c1, oNewMerged.r1)) {
this.worksheet.mergeManager.add(oNewMerged, 1); if(to.c2 < oNewMerged.c2)
oNewMerged.c2 = to.c2;
if(to.r2 < oNewMerged.r2)
oNewMerged.r2 = to.r2;
if(!oNewMerged.isOneCell())
this.worksheet.mergeManager.add(oNewMerged, 1);
}
} }
} }
} }
......
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