git-svn-id:...

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

PowerPoint/Drawing/DrawingDocument.js

@@ -4200,7 +4200,6 @@ function CThumbnailsManager()
         }
 
         check_KeyboardEvent(e);
-        var b_no_prevent_default = false;
         switch (global_keyboardEvent.KeyCode)
         {
             case 13:    // enter
@@ -4404,7 +4403,7 @@ function CThumbnailsManager()
                 if(global_keyboardEvent.CtrlKey)
                 {
                     Editor_Paste(editor, true);
-                    b_no_prevent_default = true;
+                    return undefined;
                 }
                 break;
 
@@ -4414,8 +4413,8 @@ function CThumbnailsManager()
             {
                 if(global_keyboardEvent.CtrlKey)
                 {
-                    return Editor_Copy(editor);
-                    b_no_prevent_default = true;
+                    Editor_Copy(editor);
+                    return undefined;
                 }
                 break;
             }
@@ -4560,9 +4559,8 @@ function CThumbnailsManager()
                 break;
         }
 
-       /* if(!(b_no_prevent_default === true))
-            e.preventDefault();      */
-        //return false;
+        e.preventDefault();
+        return false;
     }
 }
 

PowerPoint/Drawing/HtmlPage.js

@@ -1647,8 +1647,10 @@ function CEditorPage(api)
         if (oWordControl.Thumbnails.FocusObjType == FOCUS_OBJECT_THUMBNAILS)
         {
             var ret = oWordControl.Thumbnails.onKeyDown(e);
-            if (!ret)
+            if (false === ret)
                 return false;
+            if (undefined === ret)
+                return;
         }
 
         if (oThis.TextBoxInputMode)

PowerPoint/index.html

@@ -130,6 +130,7 @@
 
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Charts/charts.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Excel/graphics/DrawingContextWord.js"></script>
+	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Serialize2.js"></script>
 
 
     <script src="../../../../OfficeWeb/Common/commonDefines.js"></script>