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

http://bugzserver/show_bug.cgi?id=27434 - [Copy&Paste] Появление браузерного...

http://bugzserver/show_bug.cgi?id=27434 -  [Copy&Paste] Появление браузерного скролла при вставке текста во фрейм диаграммы под Safari

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59501 954022d7-b5bf-4e40-9824-e11837661b57
parent f922fafe
......@@ -2749,7 +2749,8 @@ PasteProcessor.prototype =
}
//проверка на возможность втавки в формулу
if(!this.oLogicDocument.Can_InsertContent(oSelectedContent, NearPos))
//TODO проверку на excel пеерсмотреть!!!!
if(!this.pasteInExcel && !this.oLogicDocument.Can_InsertContent(oSelectedContent, NearPos))
return;
oDoc.Insert_Content(oSelectedContent, NearPos);
......
......@@ -536,8 +536,6 @@
pasteRange: function (worksheet) {
var t = this;
this._startCopyOrPaste();
if(AscBrowser.isMozilla)
t._editorPaste(worksheet,t._getStylesSelect);
else
......@@ -860,7 +858,9 @@
_editorPaste: function (worksheet,callback) {
if(window.USER_AGENT_SAFARI_MACOS)
return;
this._startCopyOrPaste();
var t = this;
window.GlobalPasteFlagCounter = 1;
isTruePaste = false;
......
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