Commit bcababca authored by GoshaZotov's avatar GoshaZotov

+previous

parent 50dc5a1e
...@@ -9297,7 +9297,6 @@ ...@@ -9297,7 +9297,6 @@
var mergeArr = []; var mergeArr = [];
var n = 0;
var addComments = function(pasteRow, pasteCol, comments) var addComments = function(pasteRow, pasteCol, comments)
{ {
var comment; var comment;
...@@ -9323,8 +9322,7 @@ ...@@ -9323,8 +9322,7 @@
} }
} }
if (!isOneMerge) if (!isOneMerge) {
{
if (curMerge != null && !isMerged) { if (curMerge != null && !isMerged) {
var offsetCol = curMerge.c2 - curMerge.c1; var offsetCol = curMerge.c2 - curMerge.c1;
if (offsetCol + nCol >= gc_nMaxCol0) { if (offsetCol + nCol >= gc_nMaxCol0) {
...@@ -9337,28 +9335,18 @@ ...@@ -9337,28 +9335,18 @@
} }
pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow}; pastedRangeProps.offsetLast = {offsetCol: offsetCol, offsetRow: offsetRow};
mergeArr.push({
mergeArr[n] = {
r1: curMerge.r1 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff, r1: curMerge.r1 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff,
r2: curMerge.r2 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff, r2: curMerge.r2 + arn.r1 - activeCellsPasteFragment.r1 + rowDiff,
c1: curMerge.c1 + arn.c1 - activeCellsPasteFragment.c1 + colDiff, c1: curMerge.c1 + arn.c1 - activeCellsPasteFragment.c1 + colDiff,
c2: curMerge.c2 + arn.c1 - activeCellsPasteFragment.c1 + colDiff c2: curMerge.c2 + arn.c1 - activeCellsPasteFragment.c1 + colDiff
}; });
n++;
} }
} }
else else {
{
if (!isMerged) { if (!isMerged) {
pastedRangeProps.offsetLast = {offsetCol: isMergedFirstCell.c2 - isMergedFirstCell.c1, offsetRow: isMergedFirstCell.r2 - isMergedFirstCell.r1}; pastedRangeProps.offsetLast = {offsetCol: isMergedFirstCell.c2 - isMergedFirstCell.c1, offsetRow: isMergedFirstCell.r2 - isMergedFirstCell.r1};
mergeArr.push({r1: isMergedFirstCell.r1, r2: isMergedFirstCell.r2, c1: isMergedFirstCell.c1, c2: isMergedFirstCell.c2});
mergeArr[n] = {
r1: isMergedFirstCell.r1,
r2: isMergedFirstCell.r2,
c1: isMergedFirstCell.c1,
c2: isMergedFirstCell.c2
};
n++;
} }
} }
}; };
......
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