git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49673 954022d7-b5bf-4e40-9824-e11837661b57

Common/wordcopypaste.js

@@ -4695,7 +4695,7 @@ PasteProcessor.prototype =
 
 function SafariIntervalFocus()
 {
-    if (window.editor && window.editor.WordControl && window.editor.WordControl.IsFocus && !window.editor.WordControl.TextBoxInputMode)
+    if (window.editor && window.editor.WordControl && window.editor.WordControl.IsFocus && (!window.editor.WordControl.TextBoxInputFocus))
     {
         var pastebin = document.getElementById(COPY_ELEMENT_ID);
         if (pastebin)

Word/Drawing/HtmlPage.js

@@ -2189,6 +2189,9 @@ function CEditorPage(api)
             e.preventDefault();
             return false;
         }
+
+        if (global_keyboardEvent.CtrlKey == true && (global_keyboardEvent.KeyCode == 86 || global_keyboardEvent.KeyCode == 67))
+            oWordControl.bIsUseKeyPress = false;
     }
 
     this.onKeyUp = function(e)