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

Common/Shapes/Serialize.js

@@ -366,6 +366,26 @@ function BinaryPPTYLoader()
 
         this.ImageMapChecker = null;
     }
+    
+    this.Load2(data, presentation)
+    {
+        this.presentation = presentation;
+        this.ImageMapChecker = new Object();
+        
+        this.stream = new FileStream(data, data,length);
+        this.stream.obj = null;
+        
+        this.presentation.ImageMap = new Object();
+        this.presentation.Fonts = new Array();
+        this.presentation.EmbeddedFonts = new Array();
+
+        if (presentation.globalTableStyles)
+            this.NextTableStyleId = this.presentation.globalTableStyles.length;
+
+        this.LoadDocument();
+
+        this.ImageMapChecker = null;        
+    }
 
     this.LoadDocument = function()
     {

Word/Drawing/Metafile.js

@@ -1156,7 +1156,7 @@ CMetafile.prototype =
         }
         
         var _src = "";
-        if (!window.native)
+        if (!window.NATIVE_EDITOR_ENJINE)
         {
             var _img = window.editor.ImageLoader.map_image_index[img];
             if (_img == undefined || _img.Image == null)