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

перенес место вызова ф-ии lockDraw

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57047 954022d7-b5bf-4e40-9824-e11837661b57
parent 3ea6d6ec
...@@ -8028,6 +8028,8 @@ ...@@ -8028,6 +8028,8 @@
var t = this; var t = this;
var callTrigger = false; var callTrigger = false;
if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); } if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); }
lockDraw(t.model.workbook);
var selectData; var selectData;
if(isLocal === 'binary') if(isLocal === 'binary')
selectData = t._pasteFromBinary(val); selectData = t._pasteFromBinary(val);
...@@ -8039,12 +8041,14 @@ ...@@ -8039,12 +8041,14 @@
if (!selectData) { if (!selectData) {
bIsUpdate = false; bIsUpdate = false;
History.EndTransaction(); History.EndTransaction();
buildRecalc(t.model.workbook);
unLockDraw(t.model.workbook);
return; return;
} };
t.expandColsOnScroll(); t.expandColsOnScroll();
t.expandRowsOnScroll(); t.expandRowsOnScroll();
var arrFormula = selectData[1]; var arrFormula = selectData[1];
lockDraw(t.model.workbook);
for (var i = 0; i < arrFormula.length; ++i) {//!!! for (var i = 0; i < arrFormula.length; ++i) {//!!!
var rangeF = arrFormula[i].range; var rangeF = arrFormula[i].range;
var valF = arrFormula[i].val; var valF = arrFormula[i].val;
...@@ -8054,7 +8058,8 @@ ...@@ -8054,7 +8058,8 @@
var oBBox = rangeF.getBBox0(); var oBBox = rangeF.getBBox0();
t.model._getCell(oBBox.r1, oBBox.c1).setValue(valF); t.model._getCell(oBBox.r1, oBBox.c1).setValue(valF);
} }
} };
buildRecalc(t.model.workbook); buildRecalc(t.model.workbook);
unLockDraw(t.model.workbook); unLockDraw(t.model.workbook);
var arn = selectData[0]; var arn = selectData[0];
......
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