Commit 884940a5 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

fix #20132

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49451 954022d7-b5bf-4e40-9824-e11837661b57
parent a5cdc08e
......@@ -2524,7 +2524,7 @@
_insertImages: function (ws, array, onlyFromLocalStorage) {
//object{images:,fromCol,fromRow}
if(!array || array && array.length == 0 || !onlyFromLocalStorage)
if(!array || array && array.length == 0)
return false;
var firstRange = ws.activeRange.clone(true);
......
......@@ -7421,8 +7421,8 @@
rangeUnMerge.unmerge();
if(!isOneMerge)
{
arn.r2 = rMax2 - 1;
arn.c2 = cMax2 -1;
arn.r2 = (rMax2 - 1 > 0) ? (rMax2 - 1) : 0;
arn.c2 = (cMax2 - 1 > 0) ? (cMax2 - 1) : 0;
}
var mergeArr = [];
......
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