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

откат(ws.paste() -> ws.setSelectionInfo("paste",...))

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53891 954022d7-b5bf-4e40-9824-e11837661b57
parent dfbff489
...@@ -1440,7 +1440,7 @@ ...@@ -1440,7 +1440,7 @@
} }
else else
{ {
worksheet.paste(t ,false, true); worksheet.setSelectionInfo('paste',t,false,true);
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
return; return;
...@@ -1492,7 +1492,7 @@ ...@@ -1492,7 +1492,7 @@
var newFonts = {}; var newFonts = {};
pasteData.generateFontMap(newFonts); pasteData.generateFontMap(newFonts);
worksheet._loadFonts(newFonts, function() { worksheet._loadFonts(newFonts, function() {
worksheet.paste(pasteData, false, "binary"); worksheet.setSelectionInfo('paste', pasteData, false, "binary");
}); });
} }
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
...@@ -1534,7 +1534,7 @@ ...@@ -1534,7 +1534,7 @@
} }
else else
{ {
worksheet.paste(t, false, true); worksheet.setSelectionInfo('paste',t,false,true);
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
return; return;
...@@ -1558,7 +1558,7 @@ ...@@ -1558,7 +1558,7 @@
} }
else else
{ {
worksheet.paste(t, false, true); worksheet.setSelectionInfo('paste',t,false,true);
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
return; return;
...@@ -1920,7 +1920,7 @@ ...@@ -1920,7 +1920,7 @@
if(!api || (api && !api.isChartEditor)) if(!api || (api && !api.isChartEditor))
aResult.addImages = addImages; aResult.addImages = addImages;
aResult.fontsNew = t.fontsNew; aResult.fontsNew = t.fontsNew;
worksheet.paste(aResult, t); worksheet.setSelectionInfo('paste',aResult,t);
window.GlobalPasteFlagCounter = 0; window.GlobalPasteFlagCounter = 0;
window.GlobalPasteFlag = false; window.GlobalPasteFlag = false;
}, },
...@@ -3041,7 +3041,7 @@ ...@@ -3041,7 +3041,7 @@
} }
this.aResult.fontsNew = this.fontsNew; this.aResult.fontsNew = this.fontsNew;
worksheet.paste(this.aResult, this); worksheet.setSelectionInfo('paste', this.aResult, this);
}, },
_parseChildren: function(children, activeRange) _parseChildren: function(children, activeRange)
......
This diff is collapsed.
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