git-svn-id:...

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

Common/Native/native.js

@@ -229,7 +229,7 @@ function GetNativeEngine()
 
 var native_renderer = null;
 var _api = null;
-var Asc = null;
+var Asc = window["Asc"];
 
 function NativeOpenFile()
 {
@@ -240,8 +240,7 @@ function NativeOpenFile()
         _api.asc_nativeOpenFile(doc_bin);
     }
     else
-    {
-        Asc = window["Asc"];    
+    { 
         _api = new window["Asc"]["spreadsheet_api"];
         var doc_bin = window.native.GetFileString(g_file_path);
         _api.asc_nativeOpenFile(doc_bin);
@@ -265,7 +264,6 @@ function NativeOpenFile2()
     }
     else
     {
-        Asc = window["Asc"];    
         _api = new window["Asc"]["spreadsheet_api"];
         var doc_bin = window.native.GetFileString(window.g_file_path);
         _api.asc_nativeOpenFile(doc_bin);

Excel/api.js

@@ -22,6 +22,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		var asc_CAscLicense = asc.asc_CAscLicense;
 		var asc_CTrackFile = asc.CTrackFile;
 		var prot;
+		var CDocsCoApi = window["CDocsCoApi"];
 
 		/** @constructor */
 		function spreadsheet_api(name, inputName, eventsHandlers, options) {

Excel/model/FormulaObjects/parserFormula.js

 "use strict";
-window.FormulaObjects = {};
+var FormulaObjects = {};
 /** @enum */
 var cElementType = {
     number:0,

Excel/view/mobileTouch.js

@@ -2062,4 +2062,4 @@ CMobileTouchManager.prototype = {
             }
         }
     }
-}
+};
\ No newline at end of file

Word/Drawing/Graphics.js

 var g_fontManager2 = null;
 
-function CGrRFonts()
-{
-    this.Ascii    = {Name: "Empty", Index: -1};
-    this.EastAsia = {Name: "Empty", Index: -1};
-    this.HAnsi    = {Name: "Empty", Index: -1};
-    this.CS       = {Name: "Empty", Index: -1};
-}
-CGrRFonts.prototype =
-{
-    checkFromTheme : function(fontScheme, rFonts)
-    {
-        this.Ascii.Name     = fontScheme.checkFont(rFonts.Ascii.Name);
-        this.EastAsia.Name  = fontScheme.checkFont(rFonts.EastAsia.Name);
-        this.HAnsi.Name     = fontScheme.checkFont(rFonts.HAnsi.Name);
-        this.CS.Name        = fontScheme.checkFont(rFonts.CS.Name);
-
-        this.Ascii.Index    = -1;
-        this.EastAsia.Index = -1;
-        this.HAnsi.Index    = -1;
-        this.CS.Index       = -1;
-    }
-};
-
 function CClipManager()
 {
     this.clipRects = [];

Word/Drawing/Metafile.js

+function CGrRFonts()
+{
+    this.Ascii    = {Name: "Empty", Index: -1};
+    this.EastAsia = {Name: "Empty", Index: -1};
+    this.HAnsi    = {Name: "Empty", Index: -1};
+    this.CS       = {Name: "Empty", Index: -1};
+}
+CGrRFonts.prototype =
+{
+    checkFromTheme : function(fontScheme, rFonts)
+    {
+        this.Ascii.Name     = fontScheme.checkFont(rFonts.Ascii.Name);
+        this.EastAsia.Name  = fontScheme.checkFont(rFonts.EastAsia.Name);
+        this.HAnsi.Name     = fontScheme.checkFont(rFonts.HAnsi.Name);
+        this.CS.Name        = fontScheme.checkFont(rFonts.CS.Name);
+
+        this.Ascii.Index    = -1;
+        this.EastAsia.Index = -1;
+        this.HAnsi.Index    = -1;
+        this.CS.Index       = -1;
+    }
+};
+
 var gr_state_pen        = 0;
 var gr_state_brush      = 1;
 var gr_state_pen_brush  = 2;