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

http://bugzserver/show_bug.cgi?id=27909 - [Copy&Paste] Некорректное...

http://bugzserver/show_bug.cgi?id=27909 - [Copy&Paste] Некорректное копирование слайда в пустой презентации

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60112 954022d7-b5bf-4e40-9824-e11837661b57
parent 1f8d4799
......@@ -2503,6 +2503,9 @@ function Body_Paste(api, e)
ifr.style.zIndex = -1000;
document.body.appendChild(ifr);
}
else
ifr.style.width = '10000px';
var frameWindow = window.frames["pasteFrame"];
if(frameWindow)
{
......@@ -2516,6 +2519,8 @@ function Body_Paste(api, e)
bExist = true;
}
}
ifr.style.width = '100px';
}
else if(sBase64)
{
......@@ -7426,7 +7431,7 @@ PasteProcessor.prototype =
function SafariIntervalFocus()
{
if (window.editor && window.editor.WordControl && window.editor.WordControl.IsFocus && (!window.editor.WordControl.TextBoxInputFocus))
if (window.editor && window.editor.WordControl && window.editor.WordControl.IsFocus && (!g_bIsDocumentCopyPaste || (g_bIsDocumentCopyPaste && !window.editor.WordControl.TextBoxInputFocus)))
{
var pastebin = document.getElementById(COPY_ELEMENT_ID);
if (pastebin)
......
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